fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-11-20 23:58:20 -05:00
parent 45a58de539
commit 8fcbb60cf7

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
{