aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/System
diff options
context:
space:
mode:
authorPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
committerPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
commita0d31a49a0047a39cb2c4f7d67be64153b0a3266 (patch)
tree8c0b3a7fb0b68bf778b92872a32949a88b891d80 /MediaBrowser.Api/System
parent6bbb968b578fe42224227b70e78825bbed5cfc6f (diff)
parent6c6e9ca9f22d4c4bd1175d4abae846d09d2f074d (diff)
merging with master to clear merge conflict
Diffstat (limited to 'MediaBrowser.Api/System')
-rw-r--r--MediaBrowser.Api/System/ActivityLogWebSocketListener.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index 0df46c3996..43f3c5a223 100644
--- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
+++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Api.System
/// <summary>
/// Class SessionInfoWebSocketListener
/// </summary>
- class ActivityLogWebSocketListener : BasePeriodicWebSocketListener<List<ActivityLogEntry>, WebSocketListenerState>
+ public class ActivityLogWebSocketListener : BasePeriodicWebSocketListener<List<ActivityLogEntry>, WebSocketListenerState>
{
/// <summary>
/// Gets the name.