Remove comment

Signed-off-by: Tyler Ohlsen <[email protected]>
opensearch-project · Feb 6, 2023 · d21a01a · d21a01a
1 parent 32ddc3b
commit d21a01a
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/plugins/vis_augmenter/common/types.ts b/src/plugins/vis_augmenter/common/types.ts
@@ -26,12 +26,6 @@ export interface VisLayer {
 
 export type VisLayers = VisLayer[];
 
-<<<<<<< HEAD
-=======
-// persisting the ID so we can reference the rest of the metadata
-// stored at the VisLayer level. Needed for tooltip formatting and
-// partitioning the data in the View Events page
->>>>>>> 5c1cbb8a1d (Add view events flyout)
 export interface EventMetadata {
   pluginResourceId: string;
   tooltip?: string;