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

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