Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: repair conflicts
  • Loading branch information
vanoneang committed Jul 21, 2020
commit 2271e9600b718c3be18e87762afc6056740970a2
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ module.exports = {
'no-underscore-dangle': 0, // 无下划线
'no-restricted-syntax': 0,
'consistent-return': 'off',
semi: ['error', 'never'],
'no-prototype-builtins': 'off',
'class-methods-use-this': 'off',
semi: ['error', 'never'], // 无分号
'arrow-parens': ['error', 'as-needed'],
'comma-dangle': ['error', 'only-multiline'],
'no-param-reassign': ['error', { props: false }],
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.