Commits

Vadim Savchuk  committed fb85792

STORM-1553 FIXED Removing remnants of an unfinished merge from settings.xml.

  • Participants
  • Parent commits 60e09a4
  • Tags 2.8.3-release, DRTVWR-74_2.8.3-release

Comments (0)

Files changed (1)

File indra/newview/app_settings/settings.xml

     <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
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
     </map>
     <key>WaterGLFogDensityScale</key>
     <map>