javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge

Browse Source
This commit is contained in:
Martin Guillon
2021-05-05 10:17:58 +02:00
parent 3ae12184e5
commit 390b8e4e31
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tsconfig.eslint.json
View File

@ -1,10 +1,4 @@
{ {
<<<<<<< HEAD
"extends": "./tsconfig.json",
"include": ["packages/**/*"]
}
=======
"extends": "./tsconfig.json", "extends": "./tsconfig.json",
"include": ["packages/**/*"] "include": ["packages/**/*"]
} }
>>>>>>> 9ec404225ef0cff5f82d759fcdc7b85952e65c0d