resolve conflicts

This commit is contained in:
atomiks
2017-12-31 00:42:36 +11:00
parent 7288eabd27
commit c8142c3a28
3 changed files with 90 additions and 1 deletions

View File

@ -18,7 +18,8 @@
"linter": "node ./scripts/lint.js",
"tagger": "node ./scripts/tag.js",
"webber": "node ./scripts/web.js",
"tdd": "node ./scripts/tdd.js"
"tdd": "node ./scripts/tdd.js",
"module": "node .scripts/module.js"
},
"repository": {
"type": "git",