From c81b71cc1f827381a996c4ffc284236dfe040d27 Mon Sep 17 00:00:00 2001
From: Dennis Felsing <dennis@felsin9.de>
Date: Wed, 10 Feb 2016 01:49:18 +0100
Subject: [PATCH] Fix bad merge

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

diff --git a/packages.json b/packages.json
index d482e9c..840289d 100644
--- a/packages.json
+++ b/packages.json
@@ -4062,7 +4062,6 @@
     "web": "https://github.com/lompik/pari.nim"
   },
   {
-<<<<<<< HEAD
     "name": "spacenav",
     "url": "git://github.com/nimious/spacenav.git",
     "method": "git",