diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/fr/floater_sys_well.xml | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_sys_well.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_sys_well.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml index 669c18c9b9..279320b04e 100644 --- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notification_chiclet" title="NOTIFICATIONS"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="notification_chiclet" title="NOTIFICATIONS"/> |