From 106a2f3e1a0bfee9e056ef22b94599c7b2a47530 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 27 Jan 2016 01:31:31 -0500
Subject: add back MergeMetadataAndImagesByName

Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 77bce5cbd..91e20c3e0 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
+        public bool MergeMetadataAndImagesByName { get; set; }
+
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>
-- 
cgit v1.2.3