fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent 45a58de539
commit 8fcbb60cf7

@ -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
{

Loading…
Cancel
Save