From 8a82d324dd6a8099f56f56b86e5dbc03ea090149 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 12 Nov 2015 14:51:34 -0500
Subject: [PATCH] fix merge conflicts

---
 MediaBrowser.Model/System/SystemInfo.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index e3e8c7be23..ffc65cb664 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -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>();
         }
     }
 }