Projects >> errai >>966a1c3dab652dab9043b6843f9a9409c5351aa8

Chunk
Conflicting content 
package org.jboss.errai.ioc.rebind.ioc.codegen;

<<<<<<< HEAD
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
=======
import org.jboss.errai.ioc.rebind.ioc.codegen.builder.impl.StatementBuilder;
import org.jboss.errai.ioc.rebind.ioc.codegen.exception.OutOfScopeException;
import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClass;
>>>>>>> 270a02805c73ae7f0a25883dbefaef54e0ff13eb

import javax.enterprise.util.TypeLiteral;
Solution content 
package org.jboss.errai.ioc.rebind.ioc.codegen;

import java.util.*;
import javax.enterprise.util.TypeLiteral;
File
Context.java
Developer's decision
Manual
Kind of conflict
Import