aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/README.md b/README.md
index ca6437a0e..ddada7ec9 100644
--- 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