From b106fa814bfdd5576199969afa6302cda1274c49 Mon Sep 17 00:00:00 2001
From: kumavis <kumavis@users.noreply.github.com>
Date: Thu, 3 Aug 2017 16:35:54 -0700
Subject: [PATCH] README - fix bad merge

---
 README.md | 4 ----
 1 file changed, 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