alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-01 05:18:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix merge conflicts with SyncPlay

Browse Source
This commit is contained in:
Patrick Barron
2020-05-26 20:52:05 -04:00
parent 01ce56016a
commit 7c823464bc
5 changed files with 36 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Users/UserPolicy.cs
View File

@@ -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
{