aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlaviu Tamas <tamasflaviu@gmail.com>2015-02-10 18:40:43 -0500
committerFlaviu Tamas <tamasflaviu@gmail.com>2015-02-10 18:40:43 -0500
commit46be0f056f896bcd4d66298c7352b4d021f2ba05 (patch)
treea1bb27f28e617937e9c93d6a6e510b620ba59bdf
parentc59f1906d9ab2d8b88088b0281c5c625322bdc9f (diff)
downloadpackages-46be0f056f896bcd4d66298c7352b4d021f2ba05.tar.gz
packages-46be0f056f896bcd4d66298c7352b4d021f2ba05.zip
Fix overlooked line
-rw-r--r--packages.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages.json b/packages.json
index a54f0ea..6c05e64 100644
--- a/packages.json
+++ b/packages.json
@@ -1139,7 +1139,6 @@
"web": "https://github.com/Araq/Nim"
},
{
-<<<<<<< HEAD
"name": "nre",
"url": "https://github.com/flaviut/nre.git",
"method": "git",