012fa88301
Conflicts: NzbDrone/NzbDrone.csproj NzbDrone/Providers/ConfigProvider.cs |
||
---|---|---|
.. | ||
ConfigProvider.cs | ||
ConfigProvider.cs.orig | ||
ConsoleProvider.cs | ||
DebuggerProvider.cs | ||
EnviromentProvider.cs | ||
IISProvider.cs | ||
MonitoringProvider.cs | ||
ProcessProvider.cs | ||
ServiceProvider.cs | ||
WebClientProvider.cs |