Fixed English floater_preferences_graphics_advanced.xml error.

76d7f871 · Logue · 6a1b553f · 76d7f871
Commit 76d7f871 authored 1 year ago by Logue
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -676,7 +676,6 @@
  </text>

  <check_box
-<<<<<<< HEAD
    control_name="RenderAvatarVP"
    height="16"
    initial_value="true"
@@ -691,8 +690,6 @@
  </check_box>

  <check_box
-=======
->>>>>>> 3365a39080744af0566adb7b6efd8e53fc6b3339
    control_name="RenderAvatarCloth"
    height="16"
    initial_value="true"