Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs |
||
|---|---|---|
| .. | ||
| GivenThatIWantSomeFakeTests.cs | ||
| project.json | ||
Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs |
||
|---|---|---|
| .. | ||
| GivenThatIWantSomeFakeTests.cs | ||
| project.json | ||