From 73a28dd5087adb2af84301a5cc787b07b47bedd2 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 5 Jun 2018 08:54:45 +0200
Subject: [PATCH] Fixed tsconfig in chrome definitions

---
 types/chrome/tsconfig.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 5056b221ad..210a759648 100644
--- 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
     ]
 }