Projects >> application >>a994b93fe0e397eb9b39defcc7fb329f40cac6f9

Chunk
Conflicting content 
import org.collectionspace.csp.helper.core.ConfigFinder;
import org.collectionspace.csp.helper.test.TestConfigFinder;
import org.json.JSONException;
<<<<<<< HEAD
=======
import org.json.JSONObject;
>>>>>>> 8ca2932f89848dc0993825bd21d5946d12f60f9a
import org.junit.Test;
import org.xml.sax.InputSource;
import org.slf4j.Logger;
Solution content 
import org.collectionspace.csp.helper.core.ConfigFinder;
import org.collectionspace.csp.helper.test.TestConfigFinder;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Test;
import org.xml.sax.InputSource;
import org.slf4j.Logger;
File
TestSchema.java
Developer's decision
Version 2
Kind of conflict
Import