fix merge issue

This commit is contained in:
Philipp Kunz 2016-06-25 19:14:44 +02:00
commit 1dbfdeea3c
2 changed files with 3 additions and 1 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ node_modules/
.settings/ .settings/
.idea/ .idea/
test/temp/ test/temp/
test/temp2/
coverage/ coverage/
docs/ docs/

View File

@ -1,8 +1,9 @@
{ {
"name": "smartgit", "name": "smartgit",
"version": "0.0.10", "version": "0.0.11",
"description": "an easy wrapper for nodegit", "description": "an easy wrapper for nodegit",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": { "scripts": {
"test": "(npmts)" "test": "(npmts)"
}, },