Merge branch 'cherry-pick-3.2.1-0907' of github.com:vesoft-inc/nebula…

… into cherry-pick-3.2.1-0907
vesoft-inc · Sep 8, 2022 · fbbbe36 · fbbbe36
2 parents 9fc6244 + 8e35a86
commit fbbbe36
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp
@@ -31,14 +31,10 @@ folly::Future<Status> AppendVerticesExecutor::appendVertices() {
     return handleNullProp(av);
   }
 
-<<<<<<< HEAD
-  DataSet vertices = buildRequestDataSet(av);
   StorageClient *storageClient = qctx()->getStorageClient();
-=======
   auto res = buildRequestDataSet(av);
   NG_RETURN_IF_ERROR(res);
   auto vertices = std::move(res).value();
->>>>>>> fc434bbc4 (add unwind & check vidType when executing not validate (#4456))
   if (vertices.rows.empty()) {
     return finish(ResultBuilder().value(Value(DataSet(av->colNames()))).build());
   }