Fixed merge. Commented out history mode.

This commit is contained in:
2018-08-12 23:24:36 +02:00

View File

@@ -5,7 +5,7 @@
"author": "Dmytro Barylo", "author": "Dmytro Barylo",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --hot", "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --port=5000",
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules", "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
"start": "node server.js" "start": "node server.js"
}, },
@@ -19,7 +19,7 @@
"vue": "^2.1.0", "vue": "^2.1.0",
"vue-axios": "^1.2.2", "vue-axios": "^1.2.2",
"vue-data-tablee": "^0.12.1", "vue-data-tablee": "^0.12.1",
"vue-js-modal": "^1.3.12", "vue-js-modal": "^1.3.16",
"vue-router": "^2.2.1" "vue-router": "^2.2.1"
}, },
"devDependencies": { "devDependencies": {