lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-12 14:51:34 -05:00
parent 0d5903f215
commit 8a82d324dd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -43,7 +43,7 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value><c>true</c> if [supports library monitor]; otherwise, <c>false</c>.</value>
public bool SupportsLibraryMonitor { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance is network deployed.
/// </summary>
@ -86,6 +86,12 @@ namespace MediaBrowser.Model.System
/// <value>The failed assembly loads.</value>
public List<string> FailedPluginAssemblies { get; set; }
/// <summary>
/// Gets or sets the image enhancers.
/// </summary>
/// <value>The image enhancers.</value>
public List<string> ImageEnhancers { get; set; }
/// <summary>
/// Gets or sets the program data path.
/// </summary>
@ -162,6 +168,7 @@ namespace MediaBrowser.Model.System
CompletedInstallations = new List<InstallationInfo>();
FailedPluginAssemblies = new List<string>();
ImageEnhancers = new List<string>();
}
}
}