Fix merge conflict

pontusmelke · pontusmelke · commit a076465eed40 · 2019-04-18T10:49:51.000+02:00
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;
