diff options
| author | Dennis Felsing <dennis@felsin9.de> | 2016-02-10 01:49:18 +0100 |
|---|---|---|
| committer | Dennis Felsing <dennis@felsin9.de> | 2016-02-10 01:49:18 +0100 |
| commit | c81b71cc1f827381a996c4ffc284236dfe040d27 (patch) | |
| tree | 44e8b79b32d90011414a61ab0209463f4fecffe8 /packages.json | |
| parent | 9f6d2889b254c8dd270e640ee18716d7acb7566b (diff) | |
| download | packages-c81b71cc1f827381a996c4ffc284236dfe040d27.tar.gz packages-c81b71cc1f827381a996c4ffc284236dfe040d27.zip | |
Fix bad merge
Diffstat (limited to 'packages.json')
| -rw-r--r-- | packages.json | 1 |
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", |