Projects >> androidannotations >>6faa6fdecf06817ea3a5ce1a1d730b1c0ba71a13

Chunk
Conflicting content 
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
<<<<<<< HEAD
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
=======
>>>>>>> 5b965b26b9b23d81c53cf0790d3b21c85bad182a
import com.sun.codemodel.JFieldRef;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JMethod;
Solution content 
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JFieldRef;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JMethod;
File
ClickProcessor.java
Developer's decision
Version 1
Kind of conflict
Import