Fix merge conflict artifacts.
This commit is contained in:
parent
01f9a80360
commit
146fdf14fe
1 changed files with 0 additions and 1 deletions
|
|
@ -4360,7 +4360,6 @@
|
|||
"web": "https://github.com/baabelfish/mangle"
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"name": "nimshell",
|
||||
"url": "https://github.com/vegansk/nimshell",
|
||||
"method": "git",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue