fix missed merge conflict

elastic · Oct 21, 2020 · 74cb4b3 · 74cb4b3
1 parent b4e2f8b
commit 74cb4b3
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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