diff options
| author | David Ullmer <davidullmer@outlook.de> | 2021-08-10 14:03:21 +0200 |
|---|---|---|
| committer | David Ullmer <davidullmer@outlook.de> | 2021-08-10 14:03:21 +0200 |
| commit | 45e0f7893ba8f53827983109557447d2c0c8adcf (patch) | |
| tree | 05ba6fec826a6bcf4cdb17aa1ccfa6939358052c /Emby.Server.Implementations/Session/WebSocketController.cs | |
| parent | b5880c26808a6d7f183acb3f7977b42e13ccbf8a (diff) | |
| parent | 854bb79ae8b1e7004c731939e54e52ef937abe47 (diff) | |
Merge remote-tracking branch 'upstream/master' into localization-test
Diffstat (limited to 'Emby.Server.Implementations/Session/WebSocketController.cs')
| -rw-r--r-- | Emby.Server.Implementations/Session/WebSocketController.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs index a653b58c2..9fa92a53a 100644 --- a/Emby.Server.Implementations/Session/WebSocketController.cs +++ b/Emby.Server.Implementations/Session/WebSocketController.cs @@ -1,6 +1,4 @@ #pragma warning disable CS1591 -#pragma warning disable SA1600 -#nullable enable using System; using System.Collections.Generic; |