jonkeane commented on a change in pull request #11032:
URL: https://github.com/apache/arrow/pull/11032#discussion_r722337689
##########
File path: cpp/src/arrow/compute/exec/plan_test.cc
##########
@@ -840,6 +841,7 @@ TEST(ExecPlanExecution, ScalarSourceScalarAggSink) {
}))));
}
+<<<<<<< HEAD
Review comment:
Weird, this wasn't showing up in vscode, but was definitely there —
should be fixed now regardless.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
