aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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",