t did it
This commit is contained in:
parent
e287535840
commit
158620b504
|
@ -7,11 +7,7 @@
|
|||
"author": "Stylus Team",
|
||||
"devDependencies": {
|
||||
"archiver": "^3.0.0",
|
||||
<<<<<<< HEAD
|
||||
"codemirror": "^5.39.2",
|
||||
=======
|
||||
"codemirror": "^5.40.0",
|
||||
>>>>>>> upstream/master
|
||||
"eslint": "^5.4.0",
|
||||
"fs-extra": "^7.0.0",
|
||||
"jsonlint": "^1.6.3",
|
||||
|
@ -21,11 +17,7 @@
|
|||
"semver-bundle": "^0.1.1",
|
||||
"stylelint-bundle": "^8.0.0",
|
||||
"stylus-lang-bundle": "^0.54.5",
|
||||
<<<<<<< HEAD
|
||||
"updates": "^4.2.0"
|
||||
=======
|
||||
"updates": "^4.2.1"
|
||||
>>>>>>> upstream/master
|
||||
},
|
||||
"scripts": {
|
||||
"lint": "eslint **/*.js || true",
|
||||
|
|
Loading…
Reference in New Issue
Block a user