From 74cb4b3ae275db0edf75674a5dedec7705ac149a Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Wed, 21 Oct 2020 08:57:27 -0700
Subject: [PATCH] fix missed merge conflict

---
 tsconfig.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 42aab21ae85da..73646291e3d08 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,11 +14,8 @@
     "src/plugins/usage_collection/**/*",
     "src/plugins/telemetry_collection_manager/**/*",
     "src/plugins/telemetry/**/*",
-<<<<<<< HEAD
-    "src/plugins/kibana_usage_collection/**/*"
-=======
+    "src/plugins/kibana_usage_collection/**/*",
     "src/plugins/newsfeed/**/*"
->>>>>>> master
     // In the build we actually exclude **/public/**/* from this config so that
     // we can run the TSC on both this and the .browser version of this config
     // file, but if we did it during development IDEs would not be able to find