diff options
Diffstat (limited to 'Jellyfin.Api/BaseJellyfinApiController.cs')
| -rw-r--r-- | Jellyfin.Api/BaseJellyfinApiController.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Jellyfin.Api/BaseJellyfinApiController.cs b/Jellyfin.Api/BaseJellyfinApiController.cs index a34f9eb62..615f330a4 100644 --- a/Jellyfin.Api/BaseJellyfinApiController.cs +++ b/Jellyfin.Api/BaseJellyfinApiController.cs @@ -1,4 +1,8 @@ +<<<<<<< HEAD +using System; +======= using System.Net.Mime; +>>>>>>> origin/master using Microsoft.AspNetCore.Mvc; namespace Jellyfin.Api |