fixed merge conflicts.

NzbDrone.Core/Configuration/IConfigService.cs

@@ -21,7 +21,6 @@ namespace NzbDrone.Core.Configuration
         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; }

NzbDrone.Core/Datastore/Migration/008_remove_backlog.cs

@@ -4,12 +4,13 @@ using NzbDrone.Core.Datastore.Migration.Framework;
 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" });
         }
     }
 }

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" />

NzbDrone.Core/Organizer/NamingConfig.cs

@@ -39,8 +39,6 @@ namespace NzbDrone.Core.Organizer
 
         public bool ReplaceSpaces { get; set; }
 
-        //Todo: remove - not used
         public string SeasonFolderFormat { get; set; }
-        public bool UseSceneName { get; set; }
     }
 }