From 7997913d7f8d2abfe8397ae498d339f146629a47 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 28 Aug 2010 03:02:19 -0700
Subject: Fixed unresolved merge conflict in xui/fr/floater_html.xml

---
 linden/indra/newview/skins/default/xui/fr/floater_html.xml | 4 ----
 1 file changed, 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>
-- 
cgit v1.1