incubator-tinkerpop git commit: fixed a merge issue in the Graph JavaDoc.

[ok...@apache.org]

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 4d1b92533 -> c9919d919


fixed a merge issue in the Graph JavaDoc.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c9919d91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c9919d91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c9919d91

Branch: refs/heads/master
Commit: c9919d919632ac23dcbdebc26adbd33bc1414fb8
Parents: 4d1b925
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Oct 3 10:21:50 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Oct 3 10:21:50 2015 -0600

----------------------------------------------------------------------
 .../org/apache/tinkerpop/gremlin/structure/Graph.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c9919d91/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index 049176b..fc64400 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -148,33 +148,23 @@ public interface Graph extends AutoCloseable, Host {
     public GraphComputer compute() throws IllegalArgumentException;
 
     /**
-<<<<<<< HEAD
-     * Construct a {@link TraversalSource} using the specified {@code sourceBuilder}.  The {@link TraversalSource}
+     * Generate a {@link TraversalSource} using the specified {@code TraversalSource.Builder}. The {@link TraversalSource}
      * provides methods for creating a {@link Traversal} given the context of {@link TraversalStrategy} implementations
      * and a {@link GraphComputer}.
-=======
-     * Generate a {@link TraversalSource} given a {@link TraversalSource.Builder} for this {@link Graph}.
      *
      * @param sourceBuilder The traversal source builder to use
      * @param <C>           The traversal source class
-     * @return a traversal source for this graph given the traversal source builder
->>>>>>> tp30
      */
     public default <C extends TraversalSource> C traversal(final TraversalSource.Builder<C> sourceBuilder) {
         return sourceBuilder.create(this);
     }
 
     /**
-<<<<<<< HEAD
-     * Construct a {@link GraphTraversalSource} instance using the {@link StandardTraversalEngine}. The
+     * Generate a {@link GraphTraversalSource} instance using the {@link StandardTraversalEngine}. The
      * {@link TraversalSource} provides methods for creating a {@link Traversal} given the context of
      * {@link TraversalStrategy} implementations and a {@link GraphComputer}.
-=======
-     * Generate a {@link GraphTraversalSource} using the {@link StandardTraversalEngine} (i.e. classic Gremlin with OLTP).
-     * This is a short hand method for the more involved method that uses {@link Graph#traversal(TraversalSource.Builder)}.
      *
      * @return A standard graph traversal source
->>>>>>> tp30
      */
     public default GraphTraversalSource traversal() {
         return this.traversal(GraphTraversalSource.build().engine(StandardTraversalEngine.build()));