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

fix merge conflict properly

Browse Source
This commit is contained in:
Araq 2015-08-20 23:01:59 +02:00
parent b6069d4d62
commit 79989dd37d
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages.json
View File

@ -85,23 +85,6 @@
"license": "zlib", "license": "zlib",
"web": "https://github.com/Vladar4/libtcod-nim" "web": "https://github.com/Vladar4/libtcod-nim"
}, },
<<<<<<< HEAD
{
"name": "nimepak",
"url": "git://github.com/gradha/epak/",
"method": "git",
"tags": [
"library",
"serialization",
"file",
"compression"
],
"description": "File compression routines in C for iOS and Nimrod",
"license": "Allegro 4 Giftware",
"web": "https://github.com/gradha/epak"
},
=======
>>>>>>> fetch
{ {
"name": "nimgame", "name": "nimgame",
"url": "git://github.com/Vladar4/nimgame/", "url": "git://github.com/Vladar4/nimgame/",