1 files changed, 0 insertions, 8 deletions
diff --git a/public/js/wallet.js b/public/js/wallet.js
index 24ff146f..cd513202 100644
--- a/public/js/wallet.js
+++ b/public/js/wallet.js
@@ -556,11 +556,3 @@
   };
 
 }).call(this);
-<<<<<<< 73af154d7e064ed6a46583639c8b72e2c3c88731
-=======
-
-
-})()
-},{}]},{},[1])
-;
->>>>>>> Use blockchain.info as explorer