diff options
| author | McCabe Maxsted | 2010-08-28 03:02:19 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-09-16 20:39:12 -0500 |
| commit | 7997913d7f8d2abfe8397ae498d339f146629a47 (patch) | |
| tree | a6439a0f3a5fa81d5e5da828a6c855e41191f8c8 /linden/indra | |
| parent | Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map ... (diff) | |
| download | meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.zip meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.gz meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.bz2 meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.xz | |
Fixed unresolved merge conflict in xui/fr/floater_html.xml
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/fr/floater_html.xml | 4 |
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 @@ | |||
| 11 | http://www.secondlife.com | 11 | http://www.secondlife.com |
| 12 | </string> | 12 | </string> |
| 13 | <string name="support_page_url"> | 13 | <string name="support_page_url"> |
| 14 | <<<<<<< HEAD | ||
| 15 | http://support.secondlife.com | 14 | http://support.secondlife.com |
| 16 | ======= | ||
| 17 | http://wiki.secondlife.com/wiki/Knowledge_Base/fr | ||
| 18 | >>>>>>> 1.23 | ||
| 19 | </string> | 15 | </string> |
| 20 | </floater> | 16 | </floater> |