Projects >> nutz >>af8c1a18cb68042d62a848f97705491e771a6022

Chunk
Conflicting content 
import org.junit.Before;
import org.junit.Test;
<<<<<<< HEAD
import org.nutz.dao.Chain;
=======
import org.nutz.castor.Castors;
>>>>>>> 78f5259f8c15519fe7fee73e7f368cdfc19adc34
import org.nutz.dao.Cnd;
import org.nutz.dao.Condition;
import org.nutz.dao.DaoException;
Solution content 
import org.junit.Before;
import org.junit.Test;
import org.nutz.dao.Chain;
import org.nutz.castor.Castors;
import org.nutz.dao.Cnd;
import org.nutz.dao.Condition;
import org.nutz.dao.DaoException;
File
SimpleDaoTest.java
Developer's decision
Concatenation
Kind of conflict
Import