aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2015-12-28 14:22:58 +0000
committerDominik Picheta <dominikpicheta@gmail.com>2015-12-28 14:22:58 +0000
commita8a690fda73de22ce62fe2d790323d872dc02edc (patch)
treeb1967cfe34f619f85bc031e3a34a77ecc69d94ee
parent5ad8c7d5d20434595bb7055b7a2654ef25c442bd (diff)
downloadpackages-a8a690fda73de22ce62fe2d790323d872dc02edc.tar.gz
packages-a8a690fda73de22ce62fe2d790323d872dc02edc.zip
Fixes merge commit.
-rw-r--r--packages.json1
1 files changed, 0 insertions, 1 deletions
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",