Fix rebase

elastic · Dec 20, 2023 · 8e614be · 8e614be
1 parent 67c6ca3
commit 8e614be
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/...ck/plugins/observability/public/pages/slo_details/components/error_budget_chart_panel.tsx b/...ck/plugins/observability/public/pages/slo_details/components/error_budget_chart_panel.tsx
@@ -100,19 +100,11 @@ export function ErrorBudgetChartPanel({ data, isLoading, slo }: Props) {
               reverse
             />
           </EuiFlexItem>
-<<<<<<< HEAD
-          {!!remainingBudgetFormatted && (
-            <EuiFlexItem grow={false}>
-              <EuiStat
-                titleColor={isSloFailed ? 'danger' : 'success'}
-                title={remainingBudgetFormatted}
-=======
           {errorBudgetTimeRemainingFormatted ? (
             <EuiFlexItem grow={false}>
               <EuiStat
                 titleColor={isSloFailed ? 'danger' : 'success'}
                 title={errorBudgetTimeRemainingFormatted}
->>>>>>> dbedad11df2 (Add error budget remaining in time unit)
                 titleSize="s"
                 description={i18n.translate(
                   'xpack.observability.slo.sloDetails.errorBudgetChartPanel.remaining',
@@ -121,11 +113,7 @@ export function ErrorBudgetChartPanel({ data, isLoading, slo }: Props) {
                 reverse
               />
             </EuiFlexItem>
-<<<<<<< HEAD
-          )}
-=======
           ) : null}
->>>>>>> dbedad11df2 (Add error budget remaining in time unit)
         </EuiFlexGroup>
 
         <EuiFlexItem>