You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/11 13:45:03 UTC
incubator-tinkerpop git commit: cleaned up remainings of a merge
conflict
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP3-666 c20a91906 -> b9ea99938
cleaned up remainings of a merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b9ea9993
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b9ea9993
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b9ea9993
Branch: refs/heads/TINKERPOP3-666
Commit: b9ea9993888d23c5f6727632b38f3b31a552c3de
Parents: c20a919
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon May 11 13:44:51 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon May 11 13:44:51 2015 +0200
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/map/MatchTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9ea9993/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index f3499a0..672c704 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@ -45,8 +45,6 @@ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.apache.tinkerpop.gremlin.structure.P.neq;
import static org.junit.Assert.*;
-<<<<<<<HEAD
-
/**
* @author Joshua Shinavier (http://fortytwo.net)
* @author Marko A. Rodriguez (http://markorodriguez.com)