From 7504f067efd304e5563935ff49bce11ceeb87573 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Thu, 3 Sep 2020 16:19:03 -0600
Subject: [PATCH] fix merge

---
 Jellyfin.Server/Startup.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 93a12fe9d0..b222c622c4 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -53,9 +53,7 @@ namespace Jellyfin.Server
             {
                 options.HttpsPort = _serverApplicationHost.HttpsPort;
             });
-            services.AddJellyfinApi(
-                _serverConfigurationManager.Configuration.BaseUrl.TrimStart('/'),
-                _serverApplicationHost.GetApiPluginAssemblies());
+            services.AddJellyfinApi(_serverApplicationHost.GetApiPluginAssemblies());
 
             services.AddJellyfinApiSwagger();