aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Channels
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-01 22:24:58 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-01 22:24:58 -0500
commit04317f66b7516948df8432fd69b43cc1b15bee1b (patch)
tree1d9baf20bb0954b8b6c2d72503a571ac2c6d5ead /MediaBrowser.Server.Implementations/Channels
parent16de4de0035fcd1f394324aacb040e67de52529a (diff)
merge from dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels')
-rw-r--r--MediaBrowser.Server.Implementations/Channels/ChannelManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index d730998eb..c7865b6aa 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -1534,4 +1534,4 @@ namespace MediaBrowser.Server.Implementations.Channels
}
}
}
-}
+} \ No newline at end of file