Projects >> Kundera >>b11a9d0407ed6ddc52195164391619f3704229f2

Chunk
Conflicting content 
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.Metamodel;

<<<<<<< HEAD
import org.apache.commons.lang.NotImplementedException;
=======
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
>>>>>>> 19d1d6e9b2035fe31fe512aa7321637fd2a0a2d9
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Solution content 
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.Metamodel;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
File
QueryImpl.java
Developer's decision
None
Kind of conflict
Import