Projects >> errai >>f9d38dfff6190283a7c0b9662b43dc0a3c8b9c81

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

<<<<<<< HEAD
import org.jboss.errai.ioc.rebind.ioc.codegen.exception.OutOfScopeException;
import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClass;

import javax.enterprise.util.TypeLiteral;
import java.util.*;
=======
import java.util.*;
import javax.enterprise.util.TypeLiteral;

import org.jboss.errai.ioc.rebind.ioc.codegen.exception.OutOfScopeException;
import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClass;
>>>>>>> b21edca2c06beff6ec1483297416da13a0533426

/**
 * This class represents a {@link Statement} context. It has a reference to its
Solution content
package org.jboss.errai.ioc.rebind.ioc.codegen;

import org.jboss.errai.ioc.rebind.ioc.codegen.exception.OutOfScopeException;
import org.jboss.errai.ioc.rebind.ioc.codegen.meta.MetaClass;

import javax.enterprise.util.TypeLiteral;
import java.util.*;

/**
 * This class represents a {@link Statement} context. It has a reference to its
File
Context.java
Developer's decision
Version 1
Kind of conflict
Import