Fix conflicts
This commit is contained in:
+6
-1
@@ -1,5 +1,7 @@
|
||||
{
|
||||
"rulesDirectory": ["tslint-consistent-codestyle"],
|
||||
"rulesDirectory": [
|
||||
"tslint-consistent-codestyle"
|
||||
],
|
||||
"rules": {
|
||||
"array-type": [
|
||||
true,
|
||||
@@ -93,6 +95,9 @@
|
||||
true,
|
||||
{"type": "property", "modifiers": ["public", "static", "const"], "format": "UPPER_CASE"}
|
||||
],
|
||||
"no-else-after-return": {
|
||||
"options": "allow-else-if"
|
||||
},
|
||||
"prefer-const-enum": [
|
||||
true
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user