From: Jordan <jordanlavatai@gmail.com>
Date: Thu, 13 Jul 2017 00:14:31 +0000 (+0000)
Subject: Merge branch 'master' of github.com:Jlavatai/strapp
X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=commitdiff_plain;h=c8d3d5f035df084549d35fbf9880f92a5a8d9e00;hp=2fa4d84ec6b04eec92a8a1e76f8b33b2a04f3c58

Merge branch 'master' of github.com:Jlavatai/strapp
---

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