---

Ajay Kannan · Ajay Kannan · commit c4ac8b3a88c2 · 2016-01-28T18:38:50.000-08:00
yaml --- r: 4731 b: refs/heads/logging-alpha c: 71d91aa h: refs/heads/master i: 4729: ab557f7 4727: a8094e2
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: ec57eb2cab88a6e5fd195e3889e4c95bfb8068fe
+refs/heads/logging-alpha: 71d91aa5b6f603e02285207662e5faae5b1c8a7f
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -36,7 +36,6 @@ public interface QueryResults<V> extends Iterator<V> {
   Class<?> resultClass();
 
   /**
-<<<<<<< HEAD
    * Returns the Cursor for the point after the value returned in the last {@link #next} call. This
    * cursor can be used to issue subsequent queries (with the same constraints) that may return
    * additional results.
@@ -51,11 +50,7 @@ public interface QueryResults<V> extends Iterator<V> {
    * // Consume some results (using results.next()) and do any other actions as necessary.
    * query = query.toBuilder().startCursor(results.cursorAfter()).build();
    * results = datastore.run(query); // now we will iterate over all entities not yet consumed
-   * </pre>
-=======
-   * Returns the Cursor for the point after the value returned in the last {@link #next} call.
-   * Currently, {@code cursorAfter} returns null in all cases but the last result.
->>>>>>> upstream/master
+   * }</pre>
    */
   Cursor cursorAfter();
 }
