From 8bc5730fe32cc428c42275158897cfb2fab83cfe Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:42:10 -0700
Subject: [PATCH] Resolve conflict in Loc file auto-commit (#20809)

---
 resources/localization/LCL/fr/sql.xlf.lcl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/localization/LCL/fr/sql.xlf.lcl b/resources/localization/LCL/fr/sql.xlf.lcl
index 0131f30309..d6872069aa 100644
--- a/resources/localization/LCL/fr/sql.xlf.lcl
+++ b/resources/localization/LCL/fr/sql.xlf.lcl
@@ -7527,10 +7527,8 @@
       <Item ItemId=";src/sql/workbench/contrib/executionPlan/browser/compareExecutionPlanInput.epCompare.editorName" ItemType="0" PsrId="308" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[CompareExecutionPlans]]></Val>
-<<<<<<< lego/hb_04604851-bac4-4681-9f74-73de611d6e48_20221010154033643
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[CompareExecutionPlans]]></Val>
-=
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[Compare Execution Plans]]></Val>