From c81388689e03c40987b00dfd629150eb85494554 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 26 Jan 2016 13:19:05 -0500
Subject: deprecate options

Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 3 ---
 1 file changed, 3 deletions(-)

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

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