diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-03 20:22:03 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-03 20:22:03 -0400 |
| commit | e0f40f57d81da7e45be4d991e3ed369f437bbf31 (patch) | |
| tree | e08dfcfdf1072ebdf1127247146305a7e90f97cd /MediaBrowser.Controller/Library | |
| parent | 0e195d2e49f4ee9979182603a356fdb7af8d98cf (diff) | |
| parent | a37b69a49387f32b47764bd9bfa49ca791c01014 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove-common-process
Diffstat (limited to 'MediaBrowser.Controller/Library')
| -rw-r--r-- | MediaBrowser.Controller/Library/IMediaSourceProvider.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/NameExtensions.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Library/IMediaSourceProvider.cs b/MediaBrowser.Controller/Library/IMediaSourceProvider.cs index ec7798551..5bf4acebb 100644 --- a/MediaBrowser.Controller/Library/IMediaSourceProvider.cs +++ b/MediaBrowser.Controller/Library/IMediaSourceProvider.cs @@ -1,5 +1,4 @@ #pragma warning disable CS1591 -#pragma warning disable SA1600 using System.Collections.Generic; using System.Threading; diff --git a/MediaBrowser.Controller/Library/NameExtensions.cs b/MediaBrowser.Controller/Library/NameExtensions.cs index 6b0b7e53a..24d0347e9 100644 --- a/MediaBrowser.Controller/Library/NameExtensions.cs +++ b/MediaBrowser.Controller/Library/NameExtensions.cs @@ -1,6 +1,6 @@ using System; -using System.Linq; using System.Collections.Generic; +using System.Linq; using MediaBrowser.Controller.Extensions; namespace MediaBrowser.Controller.Library |