From 8dac6d3f3dbdd8b3d53b2de7be9b56eab87a8280 Mon Sep 17 00:00:00 2001
From: Grzegorz <gienkov.grzegorz@gmail.com>
Date: Sat, 18 Apr 2015 22:03:36 +0200
Subject: [PATCH] Update stringtable.xml

---
 addons/optionsmenu/stringtable.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index 946148fa79..e65087936e 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -216,11 +216,8 @@
         </Key>
         <Key ID="STR_ACE_optionsMenu_uiScaing">
             <English>Option Menu UI Scaling</English>
-<<<<<<< HEAD
             <French>Menu option: taille de l'UI</French>
-=======
->>>>>>> b2edeb01e48ce6e618b18f38f295cb5d6f0efb1d
             <Polish>Skalowanie UI menu ustawień</Polish>
         </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>