diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-08-24 18:31:14 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-08-24 18:31:14 +0100 |
| commit | 562586891f363690c212c548f428bc0d595ddb31 (patch) | |
| tree | 1e38736d9f51c45c6edf20bc940a1cb01848a015 | |
| parent | 03db6e28f30821da2364384138939ccc7df71b83 (diff) | |
| download | packages-562586891f363690c212c548f428bc0d595ddb31.tar.gz packages-562586891f363690c212c548f428bc0d595ddb31.zip | |
Fix merge mistake
| -rw-r--r-- | packages.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packages.json b/packages.json index b841ea0..1e49b7a 100644 --- a/packages.json +++ b/packages.json @@ -3087,7 +3087,6 @@ "web": "https://github.com/rgv151/pfring.nim" }, { -<<<<<<< HEAD "name": "xxtea", "url": "https://github.com/rgv151/xxtea.nim", "method": "git", |