ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict in Loc file auto-commit (#20809)

Browse Source
This commit is contained in:
Cheena Malhotra
2022-10-11 12:42:10 -07:00
committed by GitHub
parent ee2905d372
commit 8bc5730fe3
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/localization/LCL/fr/sql.xlf.lcl
View File

@@ -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>