mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-06-04 06:48:35 +01:00
removed bad merge code
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user