fix merge conflict

2015-11-20 23:58:20 -05:00 · 2015-11-20 23:58:20 -05:00 · 8fcbb60cf7
commit 8fcbb60cf7
parent 45a58de539
1 changed files with 1 additions and 1 deletions
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@ -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
        {