diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2015-11-25 11:53:51 +0000 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2015-11-25 11:53:51 +0000 |
| commit | e58bd1f7e844b3f92bf412b0a1d0a622b7c96e93 (patch) | |
| tree | a18eef3da1833eeffd4286c20926c01a0bb3bb4d | |
| parent | 6ddd19ee5f7138b36c9301f230bdae1405ae3cab (diff) | |
| download | packages-e58bd1f7e844b3f92bf412b0a1d0a622b7c96e93.tar.gz packages-e58bd1f7e844b3f92bf412b0a1d0a622b7c96e93.zip | |
Fixes botched merged.
| -rw-r--r-- | packages.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages.json b/packages.json index 953b53e..cab756f 100644 --- a/packages.json +++ b/packages.json @@ -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 } ] |