From 46be0f056f896bcd4d66298c7352b4d021f2ba05 Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Tue, 10 Feb 2015 18:40:43 -0500
Subject: [PATCH] Fix overlooked line

---
 packages.json | 1 -
 1 file changed, 1 deletion(-)

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",