version up to 1.7.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "protosite.uikit",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Front-end framework for developing web interfaces using BEMIT",
   "keywords": [],
   "author": "Boris Panchenko <hello@bpanchenko.ru>",
@@ -19,38 +19,9 @@
   },
   "homepage": "https://github.com/BPanchenko/protosite.uikit#readme",
   "license": "ISC",
-<<<<<<< HEAD
-  "private": false
-=======
   "preferGlobal": true,
   "private": false,
   "analyze": true,
   "dependencies": {},
-  "devDependencies": {
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-env": "^1.6.0",
-    "backbone": "^1.3.3",
-    "browser-sync": "^2.18.12",
-    "browser-sync-webpack-plugin": "^1.1.4",
-    "cookiesjs": "^1.4.2",
-    "css-loader": "^0.28.4",
-    "form2js": "^1.0.0",
-    "gulp": "^3.9.0",
-    "gulp-autoprefixer": "^3.1.0",
-    "gulp-clean-css": "^3.9.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-csslint": "^0.3.0",
-    "gulp-cssmin": "^0.1.7",
-    "gulp-less": "^3.0.5",
-    "gulp-rename": "^1.2.2",
-    "gulp-util": "^3.0.7",
-    "jquery": "^3.1.0",
-    "moment": "^2.14.1",
-    "underscore": "^1.8.3",
-    "underscore.string": "^3.3.4",
-    "webpack": "^2.6.1"
-  }
->>>>>>> remotes/origin/ui-sample
+  "devDependencies": {}
 }