resolve master merge conflict

This commit is contained in:
hardiknai-techm
2021-05-08 09:17:27 +05:30
23 changed files with 46 additions and 1191 deletions

View File

@@ -3,6 +3,7 @@
"allowJs": true,
"sourceMap": false,
"noImplicitAny": true,
"noImplicitThis": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"allowUnreachableCode": false,