removed leftover merge text
authorJordan <jordanlavatai@gmail.com>
Thu, 13 Jul 2017 00:19:24 +0000 (00:19 +0000)
committerJordan <jordanlavatai@gmail.com>
Thu, 13 Jul 2017 00:19:24 +0000 (00:19 +0000)
commit79eb5da0d777d6dcf46df4c33965640e31d725f4
treead2d35bd9b1d598370e11bc1be6d244cd318777e
parentc8d3d5f035df084549d35fbf9880f92a5a8d9e00
removed leftover merge text
client-test.js