delect conflict

README.md

@@ -1,30 +1,31 @@
-<<<<<<< HEAD
-# web-gantt
-=======
 # table_dropdown
->>>>>>> dev-mq
 
 ## Project setup
+
 ```
 npm install
 ```
 
 ### Compiles and hot-reloads for development
+
 ```
 npm run serve
 ```
 
 ### Compiles and minifies for production
+
 ```
 npm run build
 ```
 
 ### Lints and fixes files
+
 ```
 npm run lint
 ```
 
 ### Run your unit tests
+
 ```
 npm run test:unit
 ```

package.json

@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-  "name": "web-gantt",
-=======
   "name": "table_dropdown",
->>>>>>> dev-mq
   "version": "0.1.0",
   "private": true,
   "scripts": {
@@ -13,27 +9,6 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "dayjs": "^1.7.4",
-    "vue": "^2.5.16"
-  },
-  "devDependencies": {
-    "@types/jest": "^23.1.4",
-    "@vue/cli-plugin-babel": "^3.0.0-rc.10",
-    "@vue/cli-plugin-eslint": "^3.0.0-rc.10",
-    "@vue/cli-plugin-typescript": "^3.0.0-rc.10",
-    "@vue/cli-plugin-unit-jest": "^3.0.0-rc.10",
-    "@vue/cli-service": "^3.0.0-rc.10",
-    "@vue/eslint-config-prettier": "^3.0.0-rc.10",
-    "@vue/eslint-config-typescript": "^3.0.0-rc.10",
-    "@vue/test-utils": "^1.0.0-beta.20",
-    "babel-core": "7.0.0-bridge.0",
-    "node-sass": "^4.9.0",
-    "sass-loader": "^7.0.1",
-    "ts-jest": "^23.0.0",
-    "typescript": "^3.0.0",
-    "vue-template-compiler": "^2.5.16"
-=======
     "vue": "^2.5.17",
     "vue-class-component": "^6.0.0",
     "vue-property-decorator": "^7.0.0"
@@ -52,6 +27,5 @@
     "ts-jest": "^23.0.0",
     "typescript": "^3.0.0",
     "vue-template-compiler": "^2.5.17"
->>>>>>> dev-mq
   }
 }