Projects >> androidannotations >>a774d7a61347444733cac139cec17fbb713ade94

Chunk
Conflicting content
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.VariableElement;

<<<<<<< HEAD:AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
import org.androidannotations.annotations.rest.Accept;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.RestAnnotationHelper;
import org.androidannotations.processing.EBeanHolder;
import org.androidannotations.processing.DecoratingElementProcessor;
=======
import com.googlecode.androidannotations.annotations.rest.Accept;
import com.googlecode.androidannotations.helper.CanonicalNameConstants;
import com.googlecode.androidannotations.helper.RestAnnotationHelper;
import com.googlecode.androidannotations.processing.DecoratingElementProcessor;
import com.googlecode.androidannotations.processing.EBeanHolder;
>>>>>>> ed4239b287ed8a5309a890bb25b4c4bdd922bc36:AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessor.java
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
Solution content
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.VariableElement;

import org.androidannotations.annotations.rest.Accept;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.RestAnnotationHelper;
import org.androidannotations.processing.EBeanHolder;
import org.androidannotations.processing.DecoratingElementProcessor;
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
File
MethodProcessor.java
Developer's decision
Version 1
Kind of conflict
Import