diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 13:11:41 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 13:11:41 -0600 |
| commit | ec3e15db5789b6218482beb488433f41f9a0d8ba (patch) | |
| tree | b286c590e9d1dbc00cf1acbf8e50f90713e8faf8 /Jellyfin.Api/BaseJellyfinApiController.cs | |
| parent | 829eb1a8494b3d0a4a5170f5942f33920f179e73 (diff) | |
Fix merge and build
Diffstat (limited to 'Jellyfin.Api/BaseJellyfinApiController.cs')
| -rw-r--r-- | Jellyfin.Api/BaseJellyfinApiController.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Jellyfin.Api/BaseJellyfinApiController.cs b/Jellyfin.Api/BaseJellyfinApiController.cs index 615f330a4..a34f9eb62 100644 --- a/Jellyfin.Api/BaseJellyfinApiController.cs +++ b/Jellyfin.Api/BaseJellyfinApiController.cs @@ -1,8 +1,4 @@ -<<<<<<< HEAD -using System; -======= using System.Net.Mime; ->>>>>>> origin/master using Microsoft.AspNetCore.Mvc; namespace Jellyfin.Api |