fixed merge conflicts.

This commit is contained in:
kay.one 2013-07-04 21:09:32 -07:00
commit 7ff1335a2e
4 changed files with 4 additions and 6 deletions

View file

@ -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" });
}
}
}