Projects >> blueprints >>f277cc4c4400213f396c9bcabbfdbd5590cdd7b0

Chunk
Conflicting content 
package com.tinkerpop.blueprints.impls.orient;

<<<<<<< HEAD
import java.io.File;
import java.lang.reflect.Method;

=======
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
>>>>>>> 085f4456f9f93376493304688380aecbf28e736d
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.tinkerpop.blueprints.EdgeTestSuite;
import com.tinkerpop.blueprints.Graph;
Solution content 
package com.tinkerpop.blueprints.impls.orient;
import java.io.File;
import java.lang.reflect.Method;

import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.tinkerpop.blueprints.EdgeTestSuite;
import com.tinkerpop.blueprints.Graph;
File
OrientGraphTest.java
Developer's decision
Version 1
Kind of conflict
Import