diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:52:05 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:52:05 -0400 |
| commit | 7c823464bca70570f2f53f8af6913e53d385b784 (patch) | |
| tree | 6ef5c8ef0374967a661dade6d3d281d6d22dde6a /MediaBrowser.Model/Users | |
| parent | 01ce56016a3e7189cf29b22b095dc15b82a19303 (diff) | |
Fix merge conflicts with SyncPlay
Diffstat (limited to 'MediaBrowser.Model/Users')
| -rw-r--r-- | MediaBrowser.Model/Users/UserPolicy.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs index 7ac63a0ac..66e5529e3 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 { |