From 04317f66b7516948df8432fd69b43cc1b15bee1b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 1 Feb 2016 22:24:58 -0500
Subject: merge from dev

---
 MediaBrowser.Server.Implementations/Channels/ChannelManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/Channels')

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index d730998eb5..c7865b6aab 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
-- 
cgit v1.2.3