67299f0d97
Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj |
||
---|---|---|
.. | ||
ConfigProvider.cs | ||
DiskProvider.cs | ||
HttpProvider.cs | ||
UdpProvider.cs |
67299f0d97
Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj |
||
---|---|---|
.. | ||
ConfigProvider.cs | ||
DiskProvider.cs | ||
HttpProvider.cs | ||
UdpProvider.cs |