mqzheng/Table
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delect conflict

Browse Source
This commit is contained in:
郑茂强 2018-08-23 11:18:23 +08:00
parent e350d2e114
commit 306abb9b37
3 changed files with 5 additions and 14035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

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

14005
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -1,9 +1,5 @@
{ {
<<<<<<< HEAD
"name": "web-gantt",
=======
"name": "table_dropdown", "name": "table_dropdown",
>>>>>>> dev-mq
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -13,27 +9,6 @@
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "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": "^2.5.17",
"vue-class-component": "^6.0.0", "vue-class-component": "^6.0.0",
"vue-property-decorator": "^7.0.0" "vue-property-decorator": "^7.0.0"
@ -52,6 +27,5 @@
"ts-jest": "^23.0.0", "ts-jest": "^23.0.0",
"typescript": "^3.0.0", "typescript": "^3.0.0",
"vue-template-compiler": "^2.5.17" "vue-template-compiler": "^2.5.17"
>>>>>>> dev-mq
} }
} }