aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/Controllers/SuggestionsController.cs
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-08-03 12:01:24 -0600
committercrobibero <cody@robibe.ro>2020-08-03 12:01:24 -0600
commitdbeeb7cf4a715580432232c7098e4d86afccb37c (patch)
tree3a1149b8f71b6ca940e0ca9acf52c0fb8b23e7e7 /Jellyfin.Api/Controllers/SuggestionsController.cs
parentf915c3e5d9af689a3ffe045c5d495900e562080b (diff)
fix merge conflicts
Diffstat (limited to 'Jellyfin.Api/Controllers/SuggestionsController.cs')
-rw-r--r--Jellyfin.Api/Controllers/SuggestionsController.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/SuggestionsController.cs b/Jellyfin.Api/Controllers/SuggestionsController.cs
index bf3c1e2b1..55759f316 100644
--- a/Jellyfin.Api/Controllers/SuggestionsController.cs
+++ b/Jellyfin.Api/Controllers/SuggestionsController.cs
@@ -2,11 +2,11 @@
using System.Linq;
using Jellyfin.Api.Extensions;
using Jellyfin.Api.Helpers;
+using Jellyfin.Data.Enums;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;