Fix merge conflict

neo4j · Apr 18, 2019 · a076465 · a076465
1 parent 540f129
commit a076465
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java b/cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java
@@ -2,7 +2,6 @@
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
-<<<<<<< HEAD
 import org.neo4j.driver.internal.InternalIsoDuration;
 import org.neo4j.driver.internal.InternalNode;
 import org.neo4j.driver.internal.InternalPath;