Conflicts: NzbDrone.Web/NzbDrone.Web.csproj NzbDrone.Web/Views/Log/Index.cshtml |
||
---|---|---|
.. | ||
Properties | ||
Config.cs | ||
IISController.cs | ||
Microsoft.Web.Administration.dll | ||
NzbDrone.csproj | ||
ProcessAttacher.cs | ||
Program.cs | ||
app.config |
Conflicts: NzbDrone.Web/NzbDrone.Web.csproj NzbDrone.Web/Views/Log/Index.cshtml |
||
---|---|---|
.. | ||
Properties | ||
Config.cs | ||
IISController.cs | ||
Microsoft.Web.Administration.dll | ||
NzbDrone.csproj | ||
ProcessAttacher.cs | ||
Program.cs | ||
app.config |