From 6392508cd14947d01473bafc962e46a316b61248 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Tue, 8 Feb 2022 18:44:59 +0100
Subject: [PATCH] Solve the confilt in english.xml

---
 PowerEditor/installer/nativeLang/english.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 856871965..f9b908d7e 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -1252,12 +1252,9 @@ Do you want to go to Notepad++ page to download the latest version?"/> <!-- HowT
             <DocTooDirtyToMonitor title="Monitoring problem" message="The document is dirty. Please save the modification before monitoring it."/>
             <DocNoExistToMonitor title="Monitoring problem" message="The file should exist to be monitored."/>
             <FileTooBigToOpen title="File size problem" message="File is too big to be opened by Notepad++"/> <!-- HowToReproduce: Try to open a 4GB file (it's not easy to reproduce, it depends on your system). -->
-<<<<<<< HEAD
             <FileLoadingException title="Exception code: $STR_REPLACE$" message="An error occurred while loading the file!"/>
-=======
             <WantToOpenHugeFile title="Opening huge file warning" message="Opening a huge file of 2GB+ could take several minutes.
 Do you want to open it?"/>
->>>>>>> 2ad9dee3 (English localization for #11047)
             <CreateNewFileOrNot title="Create new file" message="&quot;$STR_REPLACE$&quot; doesn't exist. Create it?"/>
             <CreateNewFileError title="Create new file" message="Cannot create the file &quot;$STR_REPLACE$&quot;."/> <!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
             <OpenFileError title="ERROR" message="Can not open file &quot;$STR_REPLACE$&quot;."/>