Projects >> teamcity-nuget-support >>ae99d0b705f826c0ed63ceb9d845d39c4d97ce43

Chunk
Conflicting content 
    final TempFolderProvider temp = m.mock(TempFolderProvider.class);

    m.checking(new Expectations(){{
<<<<<<< HEAD
      allowing(info).isWindows(); will(returnValue(true));

=======
      allowing(info).canStartNuGetProcesses(); will(returnValue(true));
>>>>>>> d212bd8703e2c63dc4b7ecba1ed40ba0ec35d147
      allowing(prov).getNuGetRunnerPath(); will(returnValue(Paths.getNuGetRunnerPath()));
      allowing(temp).getTempDirectory(); will(returnValue(createTempDir()));
    }});
Solution content 
    final TempFolderProvider temp = m.mock(TempFolderProvider.class);

    m.checking(new Expectations(){{
      allowing(info).canStartNuGetProcesses(); will(returnValue(true));


      allowing(prov).getNuGetRunnerPath(); will(returnValue(Paths.getNuGetRunnerPath()));
      allowing(temp).getTempDirectory(); will(returnValue(createTempDir()));
    }});
File
ServerListPackagesCommandIntegrationTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation