Skip to content

Commit 6c07c4e

Browse files
committed
Merge remote-tracking branch 'origin/RVA/NLIC-905/Push_Notifications'
# Conflicts: # dist/netlicensing-client.js # dist/netlicensing-client.min.js # dist/netlicensing-client.node.js # dist/netlicensing-client.node.min.js # package-lock.json
2 parents c2afb78 + edc57a6 commit 6c07c4e

16 files changed

+20563
-24196
lines changed

.eslintrc.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ module.exports = {
1313
settings: {
1414
'import/resolver': {
1515
webpack: {
16-
config: 'build/webpack.base.conf.cjs'
17-
}
18-
}
16+
config: 'build/webpack.base.conf.cjs',
17+
},
18+
},
1919
},
2020
// add your custom rules here
2121
rules: {
2222
// allow optionalDependencies
2323
'import/no-extraneous-dependencies': ['error', {
24-
optionalDependencies: ['test/index.js']
24+
optionalDependencies: ['test/index.js'],
2525
}],
2626
// allow debugger during development
2727
'no-debugger': 'error',
28-
//custom spaces rules
29-
'indent': 'off',
28+
// custom spaces rules
29+
indent: 'off',
3030
'indent-legacy': ['error', 4, { SwitchCase: 1 }],
3131
'linebreak-style': 0,
3232
'max-len': ['error', 120, { ignoreComments: true }],
3333
'vue/no-template-key': 'off',
34-
'object-curly-newline': ["error", { "consistent": true }],
34+
'object-curly-newline': ['error', { consistent: true }],
3535
},
3636
};

0 commit comments

Comments
 (0)