Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix merge conflict

Luke Pulverenti 9 years ago
parent
45a58de539
commit
8fcbb60cf7
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      MediaBrowser.Controller/Entities/ItemImageInfo.cs

+ 1 - 1
MediaBrowser.Controller/Entities/ItemImageInfo.cs
View File 

@@ -29,7 +29,7 @@ namespace MediaBrowser.Controller.Entities
 
         /// </summary>
 
         /// <value><c>true</c> if this instance is placeholder; otherwise, <c>false</c>.</value>
 
         public bool IsPlaceholder { get; set; }
 
-        
+
 
         [IgnoreDataMember]
 
         public bool IsLocalFile
 
         {