Projects >> dozer-model >>c7260c73f58d242b6181dfb05d588bbd0b23d5a1

Chunk
Conflicting content 
import nl.dries.wicket.hibernate.dozer.properties.SimplePropertyDefinition;

import org.hibernate.HibernateException;
<<<<<<< HEAD
import org.hibernate.engine.SessionImplementor;
=======
import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.spi.SessionImplementor;
>>>>>>> 00dc759c0edb8defa788bf42ef8888fb40e913a1
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
import org.slf4j.Logger;
Solution content 
import nl.dries.wicket.hibernate.dozer.properties.SimplePropertyDefinition;

import org.hibernate.HibernateException;
import org.hibernate.collection.PersistentCollection;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
import org.slf4j.Logger;
File
ProxyBuilder.java
Developer's decision
Manual
Kind of conflict
Import