Fix merge mistake
This commit is contained in:
parent
03db6e28f3
commit
562586891f
1 changed files with 0 additions and 1 deletions
|
|
@ -3087,7 +3087,6 @@
|
||||||
"web": "https://github.com/rgv151/pfring.nim"
|
"web": "https://github.com/rgv151/pfring.nim"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"name": "xxtea",
|
"name": "xxtea",
|
||||||
"url": "https://github.com/rgv151/xxtea.nim",
|
"url": "https://github.com/rgv151/xxtea.nim",
|
||||||
"method": "git",
|
"method": "git",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue