Projects >> candlepin >>cad7cf4324d20b0b535d949429a93b5db4d9e9bf

Chunk
Conflicting content 
        owner = TestUtil.createOwner();
        ownerCurator.create(owner);
        
<<<<<<< HEAD
        entityManager().persist(o);
        entityManager().persist(type);
        entityManager().persist(consumer);
        entityManager().persist(product);
        commitTransaction();
=======
        ConsumerType type = new ConsumerType("some-consumer-type");
        consumerTypeCurator.create(type);
>>>>>>> 46e2a72c1fcd4354ee407cfddf86cd6480405b9f
        
        consumer = TestUtil.createConsumer(type, owner);
        consumerCurator.create(consumer);
Solution content 
        owner = TestUtil.createOwner();
        ownerCurator.create(owner);
        
        ConsumerType type = new ConsumerType("some-consumer-type");
        consumerTypeCurator.create(type);
        
        consumer = TestUtil.createConsumer(type, owner);
        consumerCurator.create(consumer);
File
EntitlementResourceTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable