Fix merge mistake

This commit is contained in:
Dominik Picheta 2015-08-24 18:31:14 +01:00
parent 03db6e28f3
commit 562586891f

View File

@ -3087,7 +3087,6 @@
"web": "https://github.com/rgv151/pfring.nim"
},
{
<<<<<<< HEAD
"name": "xxtea",
"url": "https://github.com/rgv151/xxtea.nim",
"method": "git",