Chunk |
---|
Conflicting content |
---|
import java.io.IOException; import java.lang.reflect.InvocationTargetException; <<<<<<< HEAD import net.sf.json.JSONArray; import net.sf.json.JSONNull; import net.sf.json.JSONObject; ======= import java.util.Iterator; >>>>>>> 375aad6ce89d66f444cb3e0409cd1a897d2a4c86 import org.apache.log4j.Logger; import org.apache.lucene.document.Document; |
Solution content |
---|
import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Iterator; import org.apache.log4j.Logger; import org.apache.lucene.document.Document; |
File |
---|
DocumentConverter.java |
Developer's decision |
---|
Version 2 |
Kind of conflict |
---|
Import |