github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(package): resolve merge conflict

Browse Source
This commit is contained in:
Dominik Ferber
2015-11-27 13:01:50 +01:00
parent 6161e14bae 66ddb9357e
commit d1c93fa21e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
package.json
View File

@@ -29,26 +29,26 @@
"homepage": "https://github.com/dferber90/eslint-plugin-meteor",
"bugs": "https://github.com/dferber90/eslint-plugin-meteor/issues",
"dependencies": {
"escope": "3.2.0",
"invariant": "2.1.2",
"escope": "3.3.0",
"invariant": "2.2.0",
"lodash.find": "3.2.1",
"lodash.memoize": "3.0.4",
"babel-runtime": "6.0.14",
"path-exists": "2.0.0"
"path-exists": "2.1.0"
},
"devDependencies": {
"babel": "5.8.34",
"babel-eslint": "4.1.5",
"babel": "5.8.29",
"babel-eslint": "4.1.6",
"colors": "1.1.2",
"coveralls": "2.11.4",
"cz-conventional-changelog": "1.1.4",
"eslint": "1.7.3",
"ghooks": "0.3.2",
"istanbul": "0.4.0",
"mocha": "2.3.3",
"eslint": "1.10.1",
"ghooks": "1.0.1",
"istanbul": "0.4.1",
"mocha": "2.3.4",
"readline-sync": "1.2.21",
"rewire": "2.4.0",
"rimraf": "2.4.3",
"rewire": "2.5.0",
"rimraf": "2.4.4",
"semantic-release": "4.3.5",
"validate-commit-msg": "1.0.0"
},