diff options
| author | Araq <rumpf_a@web.de> | 2015-08-20 23:01:59 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2015-08-20 23:01:59 +0200 |
| commit | 79989dd37ddf60408199233af1d55e1d898ba438 (patch) | |
| tree | b75fa5f341ae5ede71c5bf1f0dcca4b80392c895 | |
| parent | b6069d4d62315151742ee42b55a78749151c7f24 (diff) | |
| download | packages-79989dd37ddf60408199233af1d55e1d898ba438.tar.gz packages-79989dd37ddf60408199233af1d55e1d898ba438.zip | |
fix merge conflict properly
| -rw-r--r-- | packages.json | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/packages.json b/packages.json index d43ca3e..5c409be 100644 --- a/packages.json +++ b/packages.json @@ -85,23 +85,6 @@ "license": "zlib", "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", "url": "git://github.com/Vladar4/nimgame/", |