Merge conflict fixed

2026-08-11 12:30:18 +00:00 · 2018-06-05 08:54:10 +02:00
parent 997c1ffa0c 3880e40c72
commit 639b2c3d5e
1 changed files with 5 additions and 0 deletions
@@ -20,6 +20,11 @@
    "files": [
        "index.d.ts",
        "chrome-cast/index.d.ts",
+<<<<<<< HEAD
        "test/index.ts"
+=======
+        "test/index.ts",
+        "test/chrome-app.ts"
+>>>>>>> 3880e40c72fd987cfb539c75e9798cee27a7255b
    ]
 }