remove error

Signed-off-by: Adam Tackett <[email protected]>
opensearch-project · Jul 19, 2024 · 82aa64e · 82aa64e
1 parent c8be3ed
commit 82aa64e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/public/plugin.tsx b/public/plugin.tsx
@@ -108,11 +108,7 @@ import {
   ObservabilityStart,
   SetupDependencies,
 } from './types';
-<<<<<<< HEAD
-=======
-import { TablesFlyout } from './components/event_analytics/explorer/datasources/tables_flyout';
 import { registerAllPluginNavGroups } from './plugin_nav';
->>>>>>> 09090a6d ([Navigation] Register all plugins to NavGroups (#1926))
 
 interface PublicConfig {
   query_assist: {