diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-20 23:58:20 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-20 23:58:20 -0500 |
| commit | 8fcbb60cf726df8dae4ec69faa390714eb0df195 (patch) | |
| tree | e639aaad86d50e4ca24f886066bce75d268da709 | |
| parent | 45a58de53937816d535311a7c009829120a8c8e8 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Controller/Entities/ItemImageInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs index 505cf12b6..aa3917c15 100644 --- 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 { |