From 146fdf14fead417b1d4d9e2938c9443a1c32ec03 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 23 Mar 2016 14:30:25 +0000
Subject: [PATCH] Fix merge conflict artifacts.

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

diff --git a/packages.json b/packages.json
index 4091ccf..fd6d304 100644
--- a/packages.json
+++ b/packages.json
@@ -4360,7 +4360,6 @@
     "web": "https://github.com/baabelfish/mangle"
   },
   {
-<<<<<<< HEAD
     "name": "nimshell",
     "url": "https://github.com/vegansk/nimshell",
     "method": "git",