resolve conflic

This commit is contained in:
andri lim 2018-09-25 22:47:38 +07:00
commit 81868a8ab1

View File

@ -10791,6 +10791,20 @@
"license": "MIT",
"web": "https://github.com/Quelklef/nim-finals"
},
{
"name": "printdebug",
"url": "https://github.com/juancarlospaco/nim-printdebug",
"method": "git",
"tags": [
"debug",
"print",
"helper",
"util"
],
"description": "Print Debug for Nim, tiny 3 lines Lib, C Target",
"license": "MIT",
"web": "https://github.com/juancarlospaco/nim-printdebug"
},
{
"name": "tinyfiledialogs",
"url": "https://github.com/juancarlospaco/nim-tinyfiledialogs",
@ -10809,6 +10823,17 @@
"license": "MIT",
"web": "https://github.com/juancarlospaco/nim-tinyfiledialogs"
},
{
"name": "spotify",
"url": "https://github.com/CORDEA/spotify",
"method": "git",
"tags": [
"spotify"
],
"description": "A Nim wrapper for the Spotify Web API",
"license": "Apache License 2.0",
"web": "https://github.com/CORDEA/spotify"
},
{
"name": "noise",
"url": "https://github.com/jangko/nim-noise",