aboutsummaryrefslogtreecommitdiff
path: root/packages.json
diff options
context:
space:
mode:
Diffstat (limited to 'packages.json')
-rw-r--r--packages.json1
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",