Projects >> seqware >>926e7a95d58d251cf4ac00e1fcf4ad0cd58339cd

Chunk
Conflicting content 
import net.sourceforge.seqware.common.util.xmltools.JaxbObject;
import net.sourceforge.seqware.common.util.xmltools.XmlTools;

<<<<<<< HEAD
=======
import org.apache.commons.dbutils.DbUtils;
import org.apache.commons.lang.ArrayUtils;
>>>>>>> 50df90f09cde6a1e8dcc0be8445b35883671f70b
import org.apache.commons.dbutils.ResultSetHandler;
import org.restlet.data.MediaType;
import org.restlet.data.Status;
Solution content 
import net.sourceforge.seqware.common.util.xmltools.JaxbObject;
import net.sourceforge.seqware.common.util.xmltools.XmlTools;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.dbutils.ResultSetHandler;
import org.restlet.data.MediaType;
import org.restlet.data.Status;
File
ProcessIDResource.java
Developer's decision
Combination
Kind of conflict
Import