diff options
| author | McCabe Maxsted | 2010-08-28 03:02:19 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 05:02:08 -0700 |
| commit | e46d90a82f6fbc824dffe0f4f53aca70f30e233a (patch) | |
| tree | 284ffa2e8a36e3ce39bebaaf97dbf445f8acca2c /linden/indra/newview | |
| parent | Updated RELEASE_NOTES.txt for 1.3.0 RC2. (diff) | |
| download | meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.zip meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.gz meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.bz2 meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.xz | |
Fixed unresolved merge conflict in xui/fr/floater_html.xml
Diffstat (limited to 'linden/indra/newview')
| -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> |