diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-08-24 20:04:13 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-08-24 20:04:13 -0400 |
| commit | 9fa4fff15d27769d01d7badfca2b769f068beff6 (patch) | |
| tree | 54ec485a18b4fd9f679f66ada82a2fc31694c94d /MediaBrowser.Controller/Resolvers/ResolverPriority.cs | |
| parent | 98ed90c4a2d94dc75c4c284d695e752ee3c882d5 (diff) | |
| parent | ec3104d2d2654c47dbf41171ab218f78ddbaed23 (diff) | |
Merge branch 'master' into event-rewrite-1
# Conflicts:
# Emby.Dlna/Emby.Dlna.csproj
# Emby.Dlna/Eventing/DlnaEventManager.cs
# Emby.Dlna/Service/BaseService.cs
# Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
# MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
Diffstat (limited to 'MediaBrowser.Controller/Resolvers/ResolverPriority.cs')
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/ResolverPriority.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs index 1911e5c1d..ac73a5ea8 100644 --- a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs +++ b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs @@ -9,15 +9,22 @@ namespace MediaBrowser.Controller.Resolvers /// The first. /// </summary> First = 1, + /// <summary> /// The second. /// </summary> Second = 2, + /// <summary> /// The third. /// </summary> Third = 3, + + /// <summary> + /// The Fourth. + /// </summary> Fourth = 4, + /// <summary> /// The last. /// </summary> |