mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-11-27 04:09:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
songwanli2025@163.com 2019-12-17 17:30:54 +08:00
commit ee7ca02b41
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.js
View File

@ -1,5 +1,8 @@
module.exports = {
extends: ['plugin:vue/recommended', '@vue/standard'],
parserOptions: {
parser: "babel-eslint"
},
rules: {
'vue/max-attributes-per-line': [
2,

4
package.json
View File

@ -45,7 +45,9 @@
"css-loader": "^2.1.1",
"emoji-regex": "^8.0.0",
"emoji-unicode": "^1.0.10",
"eslint-plugin-vue": "^5.2.2",
"eslint": "^6.6.0",
"babel-eslint": "^10.0.3",
"eslint-plugin-vue": "^5.0.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "^3.0.1",
"glob": "^7.1.5",