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