Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 10:35:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-20 23:58:20 -05:00
parent 45a58de539
commit 8fcbb60cf7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/ItemImageInfo.cs
View File

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