From: Jordan <jordanlavatai@gmail.com>
Date: Thu, 13 Jul 2017 00:19:24 +0000 (+0000)
Subject: removed leftover merge text
X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fkiak.git;a=commitdiff_plain;h=79eb5da0d777d6dcf46df4c33965640e31d725f4

removed leftover merge text
---

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
+