Projects >> legacy-jclouds >>9939237c6b7db8fbd5861585623e51b4c0b7db72

Chunk
Conflicting content 
         assert jobComplete.apply(client.getVirtualMachineClient().destroyVirtualMachine(vm.getId())) : vm;
         assert virtualMachineDestroyed.apply(vm);
      }
<<<<<<< HEAD
      if (createdTemplate != null) {
         client.getTemplateClient().deleteTemplate(createdTemplate.getId());
      }
      if (registeredTemplate != null) {
         client.getTemplateClient().deleteTemplate(registeredTemplate.getId());
=======
      if (template != null) {
         AsyncCreateResponse deleteJob = client.getTemplateClient().deleteTemplate(template.getId());
         assertTrue(jobComplete.apply(deleteJob.getJobId()));
>>>>>>> 2d3b652eb31185f5d3ce8379c4c511b336348e3c
      }
      super.tearDown();
   }
Solution content 
         assert jobComplete.apply(client.getVirtualMachineClient().destroyVirtualMachine(vm.getId())) : vm;
         assert virtualMachineDestroyed.apply(vm);
      }
      if (createdTemplate != null) {
         AsyncCreateResponse deleteJob = client.getTemplateClient().deleteTemplate(template.getId());
         assertTrue(jobComplete.apply(deleteJob.getJobId()));
         client.getTemplateClient().deleteTemplate(createdTemplate.getId());
      }
      if (registeredTemplate != null) {
         client.getTemplateClient().deleteTemplate(registeredTemplate.getId());
      }
      super.tearDown();
   }
File
TemplateClientLiveTest.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable