Projects >> candlepin >>8b66b20439b04c2547e6983383230443d08f757c

Chunk
Conflicting content 
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
<<<<<<< HEAD
=======
import java.util.TimeZone;
>>>>>>> ad2ed9f0cab59be8f1e17c68ef82dc9347fad3a2

/**
 * UeberCertificateGenerator
Solution content 
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.TimeZone;

/**
 * UeberCertificateGenerator
File
UeberCertificateGenerator.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        when(consumerTypeCurator.lookupByLabel(eq(ConsumerTypeEnum.HYPERVISOR.getLabel())))
            .thenReturn(hypervisorType);
        when(idCertService.generateIdentityCert(any(Consumer.class)))
<<<<<<< HEAD
                .thenReturn(new IdentityCertificate());
=======
            .thenReturn(new IdentityCertificate());
>>>>>>> ad2ed9f0cab59be8f1e17c68ef82dc9347fad3a2

        String expectedMessage = "Forced Exception.";
        RuntimeException exception = new RuntimeException(expectedMessage);
Solution content 
        when(consumerTypeCurator.lookupByLabel(eq(ConsumerTypeEnum.HYPERVISOR.getLabel())))
            .thenReturn(hypervisorType);
        when(idCertService.generateIdentityCert(any(Consumer.class)))
            .thenReturn(new IdentityCertificate());

        String expectedMessage = "Forced Exception.";
        RuntimeException exception = new RuntimeException(expectedMessage);
File
HypervisorResourceTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation