From 562586891f363690c212c548f428bc0d595ddb31 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@googlemail.com>
Date: Mon, 24 Aug 2015 18:31:14 +0100
Subject: [PATCH] Fix merge mistake

---
 packages.json | 1 -
 1 file changed, 1 deletion(-)

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",