Fix bad merge

This commit is contained in:
Dennis Felsing 2016-02-10 01:49:18 +01:00
parent 9f6d2889b2
commit c81b71cc1f

View File

@ -4062,7 +4062,6 @@
"web": "https://github.com/lompik/pari.nim" "web": "https://github.com/lompik/pari.nim"
}, },
{ {
<<<<<<< HEAD
"name": "spacenav", "name": "spacenav",
"url": "git://github.com/nimious/spacenav.git", "url": "git://github.com/nimious/spacenav.git",
"method": "git", "method": "git",