logos-messaging/packages
1
0
Fork 0
mirror of https://github.com/logos-messaging/packages.git synced 2026-01-03 22:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes botched merged.

Browse Source
This commit is contained in:
Dominik Picheta 2015-11-25 11:53:51 +00:00
parent 6ddd19ee5f
commit e58bd1f7e8
1 changed files with 2 additions and 3 deletions
Show Stats 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" "web": "https://github.com/theduke/nim-nimlog"
}, },
{ {
<<<<<<< HEAD
"name": "values", "name": "values",
"url": "https://github.com/theduke/nim-values", "url": "https://github.com/theduke/nim-values",
"method": "git", "method": "git",
@ -3601,7 +3600,8 @@
"description": "Library for working with arbitrary values + a map data structure.", "description": "Library for working with arbitrary values + a map data structure.",
"license": "MIT", "license": "MIT",
"web": "https://github.com/theduke/nim-values" "web": "https://github.com/theduke/nim-values"
======= },
{
"name": "geohash", "name": "geohash",
"url": "https://github.com/twist-vector/nim-geohash.git", "url": "https://github.com/twist-vector/nim-geohash.git",
"method": "git", "method": "git",
@ -3626,6 +3626,5 @@
"description": "Nim implementation of the Bittorrent ascii serialization protocol", "description": "Nim implementation of the Bittorrent ascii serialization protocol",
"license": "Apache License 2.0", "license": "Apache License 2.0",
"web": "https://github.com/twist-vector/nim-bped" "web": "https://github.com/twist-vector/nim-bped"
>>>>>>> a773e798c2dafcd5b6b3338ee136c53a159f857c
} }
] ]