jyapayne/packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes botched merged.

Browse source
This commit is contained in:
Dominik Picheta 2015-11-25 11:53:51 +00:00
commit e58bd1f7e8
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages.json
View file

@ -3589,7 +3589,6 @@
"web": "https://github.com/theduke/nim-nimlog"
},
{
<<<<<<< HEAD
"name": "values",
"url": "https://github.com/theduke/nim-values",
"method": "git",
@ -3601,7 +3600,8 @@
"description": "Library for working with arbitrary values + a map data structure.",
"license": "MIT",
"web": "https://github.com/theduke/nim-values"
=======
},
{
"name": "geohash",
"url": "https://github.com/twist-vector/nim-geohash.git",
"method": "git",
@ -3626,6 +3626,5 @@
"description": "Nim implementation of the Bittorrent ascii serialization protocol",
"license": "Apache License 2.0",
"web": "https://github.com/twist-vector/nim-bped"
>>>>>>> a773e798c2dafcd5b6b3338ee136c53a159f857c
}
]