diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-15 18:07:02 +0100 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-15 18:07:02 +0100 |
| commit | e2685c51ec1964c2e894065ef5b902b29ba14442 (patch) | |
| tree | 761bb5acc627c1cdfd2315da994e91a5aaf04404 /Emby.Server.Implementations/LiveTv | |
| parent | 923313bb1cda2f265c6fa62f8b2b3f053cafd5a4 (diff) | |
| parent | 6ab2b74c18e55624c6f8896b3ec20d8ea1031195 (diff) | |
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 1 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index bbef93b8c..139aa19a4 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -1,4 +1,3 @@ -#pragma warning disable SA1600 #pragma warning disable CS1591 using System; diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs index 498aa3c26..463d0ed0a 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs @@ -1,4 +1,3 @@ -#pragma warning disable SA1600 #pragma warning disable CS1591 using System; |