Fix conflicts

This commit is contained in:
Daniel Imms
2018-04-24 10:55:53 -07:00
4 changed files with 88 additions and 98 deletions
+6 -1
View File
@@ -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
]