Projects >> queryExpander >>c37dad84b8439d544870d06cff6f7f5dc6f42fb8

Chunk
Conflicting content 
import java.util.Map;
import org.bridgedb.uri.GraphResolver;
<<<<<<< HEAD
=======
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.bridgedb.uri.RegexUriPattern;
>>>>>>> c40cb9ee1fc438f1255e5197c73e6d7aeeca1f2b
import org.bridgedb.utils.BridgeDBException;
import org.bridgedb.utils.Reporter;
import org.junit.After;
Solution content 
import org.bridgedb.uri.GraphResolver;
import java.util.Map;
import java.util.Set;
import org.bridgedb.uri.RegexUriPattern;
import org.bridgedb.utils.BridgeDBException;
import org.bridgedb.utils.Reporter;
import org.junit.After;
File
GraphResolverTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public void testGetAllowedUriPatterns() throws BridgeDBException {
        Reporter.println("getAllowedUriPatterns");
        GraphResolver instance = GraphResolver.getInstance();
<<<<<<< HEAD
        Map result = instance.getAllowedUriPatterns();
=======
        Map> result = instance.getAllowedUriPatterns();
        System.out.println(result);
>>>>>>> c40cb9ee1fc438f1255e5197c73e6d7aeeca1f2b
        assertFalse(result.isEmpty());
    }
}
Solution content 
    public void testGetAllowedUriPatterns() throws BridgeDBException {
        Reporter.println("getAllowedUriPatterns");
        GraphResolver instance = GraphResolver.getInstance();
        Map> result = instance.getAllowedUriPatterns();
        //ystem.out.println(result);
        assertFalse(result.isEmpty());
    }
}
File
GraphResolverTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable