Projects >> candlepin >>0e2cf952611b5c2122ca717fb391ba9ccc030ed5

Chunk
Conflicting content 
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

<<<<<<< HEAD
import org.apache.log4j.Logger;
import org.fedoraproject.candlepin.model.Product;
import org.fedoraproject.candlepin.model.ProductCurator;
import org.fedoraproject.candlepin.product.ProductServiceAdapter;

import com.google.inject.Inject;
=======
>>>>>>> 8bd2043bc7a455ba1b0e7ffec1d59dcef465be31

/**
 * API Gateway into /product
Solution content 
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import org.apache.log4j.Logger;
import org.fedoraproject.candlepin.model.Product;
import org.fedoraproject.candlepin.model.ProductCurator;
import org.fedoraproject.candlepin.product.ProductServiceAdapter;

import com.google.inject.Inject;


/**
 * API Gateway into /product
File
ProductResource.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.fedoraproject.candlepin.model.RulesCurator;
import org.fedoraproject.candlepin.model.SpacewalkCertificateCurator;
import org.fedoraproject.candlepin.model.SubscriptionCurator;
<<<<<<< HEAD
import org.fedoraproject.candlepin.product.ProductServiceAdapter;
import org.junit.Before;
=======
>>>>>>> 8bd2043bc7a455ba1b0e7ffec1d59dcef465be31

import com.google.inject.Guice;
import com.google.inject.Injector;
Solution content 
import org.fedoraproject.candlepin.model.RulesCurator;
import org.fedoraproject.candlepin.model.SpacewalkCertificateCurator;
import org.fedoraproject.candlepin.model.SubscriptionCurator;
import org.fedoraproject.candlepin.product.ProductServiceAdapter;
import org.junit.Before;

import com.google.inject.Guice;
import com.google.inject.Injector;
File
DatabaseTestFixture.java
Developer's decision
Version 1
Kind of conflict
Import