diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/newview/app_settings/cmd_line.xml | |
parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
-rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 0562cf5480..1b8393330d 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -363,8 +363,7 @@ <map> <key>count</key> <integer>1</integer> - <key>map-to</key> - <string>VersionChannelName</string> + <!-- Special case. Not mapped to a setting. --> </map> <key>loginpage</key> |