fix merge issue
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -2,6 +2,7 @@ node_modules/ | |||||||
| .settings/ | .settings/ | ||||||
| .idea/ | .idea/ | ||||||
| test/temp/ | test/temp/ | ||||||
|  | test/temp2/ | ||||||
| coverage/ | coverage/ | ||||||
| docs/ | docs/ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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)" | ||||||
|   }, |   }, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user