Skip to content

Commit

Permalink
Resolved conflicts in package.json and package-lock.json
Browse files Browse the repository at this point in the history
  • Loading branch information
nishant-jain-94 committed Feb 21, 2018
2 parents 81c0d0c + 5e670b2 commit 447add5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"name": "coderoom-gitlab",
"version": "1.0.0",
"version": "1.0.1",
"description": "A Review Utility Tool which facilitates in code reviewing easily.",
"bin": "./bin/coderoom.js",
"bin": {
"coderoom": "./bin/coderoom.js"
},
"scripts": {
"lint-fix": "node_modules/.bin/eslint --fix .",
"lint": "node_modules/.bin/eslint .",
Expand Down

0 comments on commit 447add5

Please sign in to comment.