removed bad merge code

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -313,7 +313,7 @@ namespace Emby.Dlna.Main
                 _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
 
                 var uri = new UriBuilder(_appHost.GetSmartApiUrl(address.Address) + descriptorUri);
-                if (string.IsNullOrEmpty(_appHost.PublishedServerUrl))
+                if (_appHost.PublishedServerUrl == null)
                 {
                     // DLNA will only work over http, so we must reset to http:// : {port}.
                     uri.Scheme = "http";

Emby.Server.Implementations/ApplicationHost.cs

@@ -1146,11 +1146,6 @@ namespace Emby.Server.Implementations
         /// <inheritdoc/>
         public bool ListenWithHttps => Certificate != null && ServerConfigurationManager.GetNetworkConfiguration().EnableHttps;
 
-        public string GetStartupOption(string propName)
-        {
-            return _startupOptions.GetType().GetProperty(propName).GetValue(src, null);
-        }
-
         /// <inheritdoc/>
         public string GetSmartApiUrl(IPAddress ipAddress, int? port = null)
         {