Fix merge conflict artifacts.

This commit is contained in:
Dominik Picheta 2016-03-23 14:30:25 +00:00
parent 01f9a80360
commit 146fdf14fe

View File

@ -4360,7 +4360,6 @@
"web": "https://github.com/baabelfish/mangle"
},
{
<<<<<<< HEAD
"name": "nimshell",
"url": "https://github.com/vegansk/nimshell",
"method": "git",