Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/edaabb44 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edaabb44 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edaabb44 Branch: refs/heads/tp33 Commit: edaabb44125c14c466c6fdf06f7374382d6509e2 Parents: e1cffe3 789e575 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Apr 25 18:40:06 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Apr 25 18:40:06 2018 -0400 ---------------------------------------------------------------------- .../process/traversal/TraversalStrategies.java | 41 +++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/edaabb44/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java index 8e24a82,091687a..31738b0 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java @@@ -284,6 -283,4 +283,4 @@@ public interface TraversalStrategies ex } } } - - -} +}
