Merge 2.x

Signed-off-by: Simeon Widdis <[email protected]>
Swiddis · Sep 10, 2024 · ed7c111 · ed7c111
1 parent b8a84af
commit ed7c111
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/public/components/report_definitions/report_settings/report_settings.tsx b/public/components/report_definitions/report_settings/report_settings.tsx
@@ -790,7 +790,6 @@ export function ReportSettings(props: ReportSettingProps) {
           />
         </EuiFormRow>
         <EuiSpacer />
-<<<<<<< HEAD
         {savedSearchRecordLimit > 10000 ? (
           <>
             <EuiCallOut
@@ -805,27 +804,12 @@ export function ReportSettings(props: ReportSettingProps) {
             <EuiSpacer size="xs" />
           </>
         ) : null}
-=======
->>>>>>> origin/2.x
         <EuiFormRow
           id="reportSourceSavedSearchRecordLimit"
           label={i18n.translate(
             'opensearch.reports.reportSettingProps.form.savedSearchRecordLimit',
             { defaultMessage: 'Record limit' }
           )}
-<<<<<<< HEAD
-=======
-          helpText={
-            savedSearchRecordLimit > 10000 ? (
-              <EuiText color="warning" size="xs">
-                <EuiIcon color="warning" type="alert" size="s" /> Generating
-                very large reports can cause memory issues.
-              </EuiText>
-            ) : (
-              ''
-            )
-          }
->>>>>>> origin/2.x
         >
           <EuiFieldNumber
             value={savedSearchRecordLimit}