Merge pull request #8 from jellyfin/master

rebase to latest master

7 files changed, 11 insertions, 12 deletions

diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs
index d4caf499b..ee1d11bc0 100644
--- a/MediaBrowser.Model/Channels/ChannelFeatures.cs
+++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Channels
 {
@@ -61,7 +61,7 @@ namespace MediaBrowser.Model.Channels
         /// </summary>
         /// <value><c>true</c> if [supports latest media]; otherwise, <c>false</c>.</value>
         public bool SupportsLatestMedia { get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance can filter.
         /// </summary>
diff --git a/MediaBrowser.Model/Channels/ChannelFolderType.cs b/MediaBrowser.Model/Channels/ChannelFolderType.cs
index 7c97afd02..6039eb929 100644
--- a/MediaBrowser.Model/Channels/ChannelFolderType.cs
+++ b/MediaBrowser.Model/Channels/ChannelFolderType.cs
@@ -14,4 +14,4 @@ namespace MediaBrowser.Model.Channels
 
         Season = 5
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Channels/ChannelInfo.cs b/MediaBrowser.Model/Channels/ChannelInfo.cs
index 36e3c17d9..9b2d31bf3 100644
--- a/MediaBrowser.Model/Channels/ChannelInfo.cs
+++ b/MediaBrowser.Model/Channels/ChannelInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Channels
 {
     public class ChannelInfo
diff --git a/MediaBrowser.Model/Channels/ChannelItemSortField.cs b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
index 6b5015b77..af75e3edd 100644
--- a/MediaBrowser.Model/Channels/ChannelItemSortField.cs
+++ b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
@@ -10,4 +10,4 @@ namespace MediaBrowser.Model.Channels
         PlayCount = 5,
         CommunityPlayCount = 6
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
index efb5021c0..010ff8048 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public enum ChannelMediaContentType
     {
@@ -20,4 +20,4 @@
 
         GameExtra = 8
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs
index 102cb6644..a3fa5cdf9 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public enum ChannelMediaType
     {
@@ -8,4 +8,4 @@
 
         Photo = 2
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index 6b5e95d69..32b368922 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
 using System;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Channels
 {
@@ -14,7 +14,7 @@ namespace MediaBrowser.Model.Channels
         public bool? EnableImages { get; set; }
         public int? ImageTypeLimit { get; set; }
         public ImageType[] EnableImageTypes { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>