Clean up merge artifact in settings.xml

Tue, 25 Feb 2014 18:59:53 +0100

author
Ansariel
date
Tue, 25 Feb 2014 18:59:53 +0100
changeset 40766
7ff16e7d4189
parent 40765
25041031792d
child 40767
1afc8f41308e

Clean up merge artifact in settings.xml

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Tue Feb 25 06:23:43 2014 +0100
     1.2 +++ b/indra/newview/app_settings/settings.xml	Tue Feb 25 18:59:53 2014 +0100
     1.3 @@ -20262,9 +20262,6 @@
     1.4        <integer>1</integer>
     1.5      </map>
     1.6      <!-- End: Prefs > Sound/Media => UI Sounds -->
     1.7 -=======
     1.8 ->>>>>>> other
     1.9 -  
    1.10      <key>FSShowVoiceVisualizer</key>
    1.11      <map>
    1.12        <key>Comment</key>

mercurial