Fixed a couple of merge errors.

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index d3e29d6a4..830c8bd10 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -233,7 +233,7 @@ namespace MediaBrowser.Model.Configuration
         /// Gets or sets a value indicating whether quick connect is available for use on this server.
         /// </summary>
         public bool QuickConnectAvailable { get; set; } = false;
-       
+
         /// <summary>
         /// Gets or sets a value indicating whether access outside of the LAN is permitted.
         /// </summary>
@@ -440,4 +440,4 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public int? ActivityLogRetentionDays { get; set; } = 30;
     }
-}
\ No newline at end of file
+}