From 7c823464bca70570f2f53f8af6913e53d385b784 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Tue, 26 May 2020 20:52:05 -0400
Subject: Fix merge conflicts with SyncPlay

---
 MediaBrowser.Model/Configuration/SyncplayAccess.cs | 23 ----------------------
 MediaBrowser.Model/Users/UserPolicy.cs             |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 MediaBrowser.Model/Configuration/SyncplayAccess.cs

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Configuration/SyncplayAccess.cs b/MediaBrowser.Model/Configuration/SyncplayAccess.cs
deleted file mode 100644
index d891a8167a..0000000000
--- a/MediaBrowser.Model/Configuration/SyncplayAccess.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    /// <summary>
-    /// Enum SyncPlayAccess.
-    /// </summary>
-    public enum SyncPlayAccess
-    {
-        /// <summary>
-        /// User can create groups and join them.
-        /// </summary>
-        CreateAndJoinGroups,
-
-        /// <summary>
-        /// User can only join already existing groups.
-        /// </summary>
-        JoinGroups,
-
-        /// <summary>
-        /// SyncPlay is disabled for the user.
-        /// </summary>
-        None
-    }
-}
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 7ac63a0aca..66e5529e3a 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -1,10 +1,10 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Text.Json.Serialization;
 using System.Xml.Serialization;
-using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
+using MediaBrowser.Model.Configuration;
+using AccessSchedule = Jellyfin.Data.Entities.AccessSchedule;
 
 namespace MediaBrowser.Model.Users
 {
-- 
cgit v1.2.3