fix bug commit

dimensi · Jan 23, 2017 · e931f5f · e931f5f
1 parent 615badc
commit e931f5f
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "gulppack",
-<<<<<<< HEAD
-  "version": "1.1.1",
-=======
-  "version": "1.1.0",
->>>>>>> master
+  "version": "1.1.2",
   "description": "Gulp + Webpack build for frondend",
   "main": "gulpfile.js",
   "scripts": {