andre/30-seconds-of-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix package merge conflict

Browse Source
This commit is contained in:
King
2018-01-03 07:06:44 -05:00
parent 246d904337
commit 5cdcd69713
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@ -1,25 +1,31 @@
{
"dependencies": {
"devDependencies": {
"babel-preset-env": "^1.6.1",
"chalk": "^2.3.0",
"fs-extra": "^4.0.2",
"html-minifier": "^3.5.7",
"markdown-it": "^8.4.0",
"node-sass": "^4.7.2",
"prettier": "^1.9.2",
"rollup": "^0.53.2",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-babel-minify": "^3.1.2",
"semistandard": "^11.0.0",
"chalk": "^2.3.0",
"tape": "^4.8.0"
},
"name": "30-seconds-of-code",
"description": "A collection of useful JavaScript snippets.",
"version": "1.0.0",
"main": "index.js",
"version": "0.0.1",
"main": "dist/_30s.js",
"module": "dist/_30s.esm.js",
"scripts": {
"builder": "node ./scripts/build.js",
"linter": "node ./scripts/lint.js",
"tagger": "node ./scripts/tag.js",
"webber": "node ./scripts/web.js",
"tdd": "node ./scripts/tdd.js",
"test": "tape test/**/*.test.js | tap-spec"
"test": "tape test/**/*.test.js | tap-spec",
"module": "node ./scripts/module.js"
},
"repository": {
"type": "git",