remove merge conflict markers

elastic · Jan 31, 2021 · d10a353 · d10a353
1 parent db413f2
commit d10a353
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
@@ -41,11 +41,8 @@
     "plugins/saved_objects_tagging/**/*",
     "plugins/global_search_bar/**/*",
     "plugins/license_management/**/*",
-<<<<<<< HEAD
     "plugins/snapshot_restore/**/*",
-=======
     "plugins/painless_lab/**/*",
->>>>>>> master
     "plugins/watcher/**/*",
     "test/**/*"
   ],