From 7ff1335a2e2a6448fd18872c7f226aa488236ae0 Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Thu, 4 Jul 2013 21:09:32 -0700
Subject: [PATCH] fixed merge conflicts.

---
 NzbDrone.Core/Configuration/IConfigService.cs                 | 1 -
 .../{007_remove_backlog.cs => 008_remove_backlog.cs}          | 3 ++-
 NzbDrone.Core/NzbDrone.Core.csproj                            | 4 ++--
 NzbDrone.Core/Organizer/NamingConfig.cs                       | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename NzbDrone.Core/Datastore/Migration/{007_remove_backlog.cs => 008_remove_backlog.cs} (78%)

diff --git a/NzbDrone.Core/Configuration/IConfigService.cs b/NzbDrone.Core/Configuration/IConfigService.cs
index c0e657bec..05521181b 100644
--- a/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/NzbDrone.Core/Configuration/IConfigService.cs
@@ -21,7 +21,6 @@ public interface IConfigService
         String DownloadedEpisodesFolder { get; set; }
         bool UseSeasonFolder { get; set; }
         string SeasonFolderFormat { get; set; }
-        bool EnableBacklogSearching { get; set; }
         bool AutoIgnorePreviouslyDownloadedEpisodes { get; set; }
         int Retention { get; set; }
         Guid UGuid { get; }
diff --git a/NzbDrone.Core/Datastore/Migration/007_remove_backlog.cs b/NzbDrone.Core/Datastore/Migration/008_remove_backlog.cs
similarity index 78%
rename from NzbDrone.Core/Datastore/Migration/007_remove_backlog.cs
rename to NzbDrone.Core/Datastore/Migration/008_remove_backlog.cs
index 86c914afd..e4d4199a6 100644
--- a/NzbDrone.Core/Datastore/Migration/007_remove_backlog.cs
+++ b/NzbDrone.Core/Datastore/Migration/008_remove_backlog.cs
@@ -4,12 +4,13 @@
 namespace NzbDrone.Core.Datastore.Migration
 {
     [Tags("")]
-    [Migration(7)]
+    [Migration(8)]
     public class remove_backlog : NzbDroneMigrationBase
     {
         protected override void MainDbUpgrade()
         {
             SQLiteAlter.DropColumns("Series", new[] { "BacklogSetting" });
+            SQLiteAlter.DropColumns("NamingConfig", new[] { "UseSceneName" });
         }
     }
 }
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 6ce281081..90c748ea9 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -213,7 +213,7 @@
     <Compile Include="Datastore\Migration\005_added_eventtype_to_history.cs" />
     <Compile Include="Datastore\Migration\006_add_index_to_log_time.cs" />
     <Compile Include="Datastore\Migration\007_add_renameEpisodes_to_naming.cs" />
-    <Compile Include="Datastore\Migration\007_remove_backlog.cs" />
+    <Compile Include="Datastore\Migration\008_remove_backlog.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationExtension.cs" />
@@ -599,4 +599,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/NzbDrone.Core/Organizer/NamingConfig.cs b/NzbDrone.Core/Organizer/NamingConfig.cs
index 4fba40d41..837325acd 100644
--- a/NzbDrone.Core/Organizer/NamingConfig.cs
+++ b/NzbDrone.Core/Organizer/NamingConfig.cs
@@ -39,8 +39,6 @@ public static NamingConfig Default
 
         public bool ReplaceSpaces { get; set; }
 
-        //Todo: remove - not used
         public string SeasonFolderFormat { get; set; }
-        public bool UseSceneName { get; set; }
     }
 }
\ No newline at end of file