diff options
| author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
| commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
| tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/skins/default/xui/pt/panel_edit_profile.xml | |
| parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/skins/default/xui/pt/panel_edit_profile.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/panel_edit_profile.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml index 4066842b25..0ba7382845 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml @@ -25,11 +25,7 @@ <text name="display_name_label" value="Nome de tela:"/> <text name="solo_username_label" value="Nome de usuário:"/> <button name="set_name" tool_tip="Definir nome de tela"/> - <text name="solo_user_name" value="Hamilton Hitchings"/> - <text name="user_name" value="Hamilton Hitchings"/> - <text name="user_name_small" value="Hamilton Hitchings"/> <text name="user_label" value="Nome de usuário:"/> - <text name="user_slid" value="hamilton.linden"/> <panel name="lifes_images_panel"> <icon label="" name="2nd_life_edit_icon" tool_tip="Selecione uma imagem"/> </panel> |