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

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