aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-08-04 07:35:54 +0800
committerGitHub <noreply@github.com>2017-08-04 07:35:54 +0800
commitb106fa814bfdd5576199969afa6302cda1274c49 (patch)
tree527da0f1c27bfd0f219932bdf9d42d17f04bf25c /README.md
parente223b0c7898ad49bd3df044ff72386869b0702be (diff)
downloadtangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar.gz
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar.bz2
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar.lz
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar.xz
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.tar.zst
tangerine-wallet-browser-b106fa814bfdd5576199969afa6302cda1274c49.zip
README - fix bad merge
Diffstat (limited to 'README.md')
-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