Merge branch 'master' into images

1 files changed, 3 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index cf6d9c2f6..f42aa2b44 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 using System;
 using MediaBrowser.Model.Dto;
 
@@ -159,7 +162,6 @@ namespace MediaBrowser.Model.Configuration
 
         public MetadataOptions[] MetadataOptions { get; set; }
 
-        public bool EnableAutomaticRestart { get; set; }
         public bool SkipDeserializationForBasicTypes { get; set; }
 
         public string ServerName { get; set; }
@@ -249,7 +251,6 @@ namespace MediaBrowser.Model.Configuration
             EnableDashboardResponseCaching = true;
             EnableCaseSensitiveItemIds = true;
 
-            EnableAutomaticRestart = true;
             AutoRunWebApp = true;
             EnableRemoteAccess = true;