From 0742a29850a9a92ac1a71a198caeed541eec640c Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 12 Aug 2011 14:48:49 +0300
Subject: STORM-1553 FIXED Removing remnants of an unfinished merge from
 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 709b4e145c..34890b23eb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12578,21 +12578,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