remove merge conflict markers

TinaHeiligers · TinaHeiligers · commit d10a353050dd · 2021-01-31T10:25:33.000-07:00
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/**/*"
   ],
