refactor(discover-shared): update test loader

tonyghiani · Apr 29, 2024 · 3d47ea0 · 3d47ea0
1 parent f3e85b3
commit 3d47ea0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/...test_serverless/functional/test_suites/observability/observability_logs_explorer/index.ts b/...test_serverless/functional/test_suites/observability/observability_logs_explorer/index.ts
@@ -16,12 +16,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./data_source_selector'));
     loadTestFile(require.resolve('./field_list'));
     loadTestFile(require.resolve('./filter_controls'));
-<<<<<<< HEAD
     loadTestFile(require.resolve('./flyout'));
-=======
-    // loadTestFile(require.resolve('./flyout_highlights'));
-    // loadTestFile(require.resolve('./flyout'));
->>>>>>> f53b567e13b79b13fdd2aa219d7f800c0e5a10be
     loadTestFile(require.resolve('./header_menu'));
   });
 }