From 79eb5da0d777d6dcf46df4c33965640e31d725f4 Mon Sep 17 00:00:00 2001
From: Jordan <jordanlavatai@gmail.com>
Date: Thu, 13 Jul 2017 00:19:24 +0000
Subject: [PATCH] removed leftover merge text

---
 client-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-test.js b/client-test.js
index a0efaa4..86078ef 100644
--- a/client-test.js
+++ b/client-test.js
@@ -220,4 +220,4 @@ document.addEventListener('DOMContentLoaded', () => {
   document.body.innerHTML = `<button> Setting up connection with host  </button>`
 
 });
->>>>>>> 2fa4d84ec6b04eec92a8a1e76f8b33b2a04f3c58
+
-- 
2.18.0