Fix merge conflict markers

Signed-off-by: Simeon Widdis <[email protected]>
opensearch-project · Sep 9, 2024 · 5ccae4b · 5ccae4b
1 parent cbae36e
commit 5ccae4b
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/public/components/report_definitions/report_settings/report_settings.tsx b/public/components/report_definitions/report_settings/report_settings.tsx
@@ -6,12 +6,8 @@
 import React, { useEffect, useState } from 'react';
 import { i18n } from '@osd/i18n';
 import {
-<<<<<<< HEAD
   EuiFieldText,
-=======
   EuiFieldNumber,
-  EuiCompressedFieldText,
->>>>>>> d4f95c90 ([Feature] Add the ability to configure record limit/count from the UI (#395))
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
@@ -20,24 +16,13 @@ import {
   EuiPageContent,
   EuiPageContentBody,
   EuiHorizontalRule,
-  EuiText,
   EuiSpacer,
-<<<<<<< HEAD
   EuiRadioGroup,
-  EuiSelect,
   EuiTextArea,
   EuiCheckboxGroup,
   EuiComboBox,
-=======
-  EuiCompressedRadioGroup,
-  EuiCompressedTextArea,
-  EuiCompressedCheckboxGroup,
-  EuiCompressedComboBox,
-  EuiFormRow,
-  OuiCallOut,
   EuiText,
   EuiIcon,
->>>>>>> d4f95c90 ([Feature] Add the ability to configure record limit/count from the UI (#395))
 } from '@elastic/eui';
 import {
   REPORT_SOURCE_RADIOS,