5bbe310af5
Conflicts: NzbDrone.Common/DiskProvider.cs NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs NzbDrone.Core/Providers/DiskScanProvider.cs NzbDrone.Core/Providers/DownloadProvider.cs |
||
---|---|---|
.. | ||
EpisodeProviderTest.cs | ||
EpisodeProviderTest_DeleteInvalidEpisodes.cs | ||
EpisodeProviderTest_GetEpisodesByParseResult.cs | ||
GetEpisodeBySceneNumberFixture.cs |