Projects >> candlepin >>e54a63485a7d65ce95ec3daf54611521cc5f295b

Chunk
Conflicting content 
        ConsumerResource consumerResource = new ConsumerResource(
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
            mockedEntitlementCertServiceAdapter, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, null, null, null, null, null, null, null, null, null,
            new Config());
=======
            null, null, mockedPoolManager, null, null, null, null, null, null,
            null, null, new Config());
>>>>>>> b874737755d130deb1f8075bbdb7497a6f6d4ff1

        List serials = consumerResource
            .getEntitlementCertificateSerials(consumer.getUuid());
Solution content 
        ConsumerResource consumerResource = new ConsumerResource(
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
            mockedEntitlementCertServiceAdapter, null, null, null, null, null,
            null, null, mockedPoolManager, null, null, null, null, null, null,
            null, null, null, new Config());

        List serials = consumerResource
            .getEntitlementCertificateSerials(consumer.getUuid());
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation