From 32013f5ae50950f5da2f3113b5fb12a943a83c16 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 5 Feb 2016 11:04:18 -0500
Subject: deprecate merge setting

---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

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