From a8a690fda73de22ce62fe2d790323d872dc02edc Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Mon, 28 Dec 2015 14:22:58 +0000
Subject: [PATCH] Fixes merge commit.

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

diff --git a/packages.json b/packages.json
index f2d7579..eed015d 100644
--- a/packages.json
+++ b/packages.json
@@ -3786,7 +3786,6 @@
     "web": "https://github.com/SSPkrolik/nim-native-dialogs"
   },
   {
-<<<<<<< HEAD
     "name": "variant",
     "url": "https://github.com/yglukhov/variant.git",
     "method": "git",