Conflicts: .gitignore NzbDrone.Core.Test/NzbDrone.Core.Test.csproj NzbDrone.Core.Test/packages.config NzbDrone.Core/packages.config