Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial

7 years ago · 82ba2c95ee
parent 55f0187df7 b106fa814b
commit 82ba2c95ee
1 changed files with 0 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -4,10 +4,6 @@
 ## Support

 If you're a user seeking support, [here is our support site](http://metamask.consensyssupport.happyfox.com).
-<<<<<<< HEAD
-
-=======
->>>>>>> b1311b48c96d873f571e26cad8e4f5d2f61dec25

 ## Developing Compatible Dapps