Fixed a couple of merge errors.

MediaBrowser.Model/Configuration/PathSubstitution.cs

@@ -1,11 +1,4 @@
 #nullable enable
-#pragma warning disable CS1591
-#pragma warning disable CA1819
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Model.Configuration
 {

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;
     }
-}
+}