Projects information

Chunk

Conflicting content
import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; <<<<<<< HEAD import org.apache.log4j.Logger; import com.google.inject.Inject; import org.fedoraproject.candlepin.auth.interceptor.SecurityHole; ======= >>>>>>> 00252ed5f341078033c6b0c05fb30526b2c80b34 /** * A root resource, responsible for returning client a struct of links to the * various resources Candlepin exposes. This list will be filtered based on the

Conflicting content

import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

<<<<<<< HEAD
import org.apache.log4j.Logger;

import com.google.inject.Inject;
import org.fedoraproject.candlepin.auth.interceptor.SecurityHole;

=======
>>>>>>> 00252ed5f341078033c6b0c05fb30526b2c80b34
/**
 * A root resource, responsible for returning client a struct of links to the
 * various resources Candlepin exposes. This list will be filtered based on the

Solution content
import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.log4j.Logger; import com.google.inject.Inject; import org.fedoraproject.candlepin.auth.interceptor.SecurityHole; /** * A root resource, responsible for returning client a struct of links to the * various resources Candlepin exposes. This list will be filtered based on the

Solution content

import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import org.apache.log4j.Logger;

import com.google.inject.Inject;
import org.fedoraproject.candlepin.auth.interceptor.SecurityHole;

/**
 * A root resource, responsible for returning client a struct of links to the
 * various resources Candlepin exposes. This list will be filtered based on the

File
RootResource.java

Developer's decision
Version 1

Kind of conflict
Import

Projects >> candlepin >>f2752f43853e1a483128982dcb5eb1c4b1f88307