Fixed tsconfig in chrome definitions

2026-06-02 06:29:40 +08:00 · 2018-06-05 08:54:45 +02:00
parent 639b2c3d5e
commit 73a28dd508
1 changed files with 0 additions and 5 deletions
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -20,11 +20,6 @@
    "files": [
        "index.d.ts",
        "chrome-cast/index.d.ts",
-<<<<<<< HEAD
        "test/index.ts"
-=======
-        "test/index.ts",
-        "test/chrome-app.ts"
->>>>>>> 3880e40c72fd987cfb539c75e9798cee27a7255b
    ]
 }