1 files changed, 0 insertions, 4 deletions

diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index 081300b..1538189 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -11,10 +11,6 @@
                 http://www.secondlife.com
         </string>
         <string name="support_page_url">
-<<<<<<< HEAD
                 http://support.secondlife.com
-=======
-                http://wiki.secondlife.com/wiki/Knowledge_Base/fr
->>>>>>> 1.23
         </string>
 </floater>