open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t did it

Browse Source
This commit is contained in:
dana 2018-08-25 10:37:05 -07:00
parent e287535840
commit 158620b504
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -7,11 +7,7 @@
"author": "Stylus Team", "author": "Stylus Team",
"devDependencies": { "devDependencies": {
"archiver": "^3.0.0", "archiver": "^3.0.0",
<<<<<<< HEAD
"codemirror": "^5.39.2",
=======
"codemirror": "^5.40.0", "codemirror": "^5.40.0",
>>>>>>> upstream/master
"eslint": "^5.4.0", "eslint": "^5.4.0",
"fs-extra": "^7.0.0", "fs-extra": "^7.0.0",
"jsonlint": "^1.6.3", "jsonlint": "^1.6.3",
@ -21,11 +17,7 @@
"semver-bundle": "^0.1.1", "semver-bundle": "^0.1.1",
"stylelint-bundle": "^8.0.0", "stylelint-bundle": "^8.0.0",
"stylus-lang-bundle": "^0.54.5", "stylus-lang-bundle": "^0.54.5",
<<<<<<< HEAD
"updates": "^4.2.0"
=======
"updates": "^4.2.1" "updates": "^4.2.1"
>>>>>>> upstream/master
}, },
"scripts": { "scripts": {
"lint": "eslint **/*.js || true", "lint": "eslint **/*.js || true",