From f30680cce995ff8fd980101f75b8d69377116b7f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 8 Aug 2011 10:56:32 -0400
Subject: correct merge-induced error in settings.xml

---
 indra/newview/app_settings/settings.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9db59205bf..01842d1037 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12629,21 +12629,13 @@
     <key>WatchdogEnabled</key>
     <map>
       <key>Comment</key>
-<<<<<<< local
-      <string>Controls whether the thread watchdog timer is activated.</string>
-=======
       <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
->>>>>>> other
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-<<<<<<< local
-      <integer>-1</integer>
-=======
       <integer>0</integer>
->>>>>>> other
     </map>
     <key>WaterGLFogDensityScale</key>
     <map>
-- 
cgit v1.2.3