Fixes merge commit.

This commit is contained in:
Dominik Picheta 2015-12-28 14:22:58 +00:00
parent 5ad8c7d5d2
commit a8a690fda7

View File

@ -3786,7 +3786,6 @@
"web": "https://github.com/SSPkrolik/nim-native-dialogs"
},
{
<<<<<<< HEAD
"name": "variant",
"url": "https://github.com/yglukhov/variant.git",
"method": "git",