aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/BaseJellyfinApiController.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Jellyfin.Api/BaseJellyfinApiController.cs')
-rw-r--r--Jellyfin.Api/BaseJellyfinApiController.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Jellyfin.Api/BaseJellyfinApiController.cs b/Jellyfin.Api/BaseJellyfinApiController.cs
index 22b9c3fd6..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
@@ -8,6 +12,7 @@ namespace Jellyfin.Api
/// </summary>
[ApiController]
[Route("[controller]")]
+ [Produces(MediaTypeNames.Application.Json)]
public class BaseJellyfinApiController : ControllerBase
{
}