andygrove commented on a change in pull request #68:
URL: https://github.com/apache/arrow-datafusion/pull/68#discussion_r675649915
##########
File path: ballista/rust/core/src/serde/physical_plan/from_proto.rs
##########
@@ -220,9 +229,36 @@ impl TryInto<Arc<dyn ExecutionPlan>> for
&protobuf::PhysicalPlanNode {
proto_error("Unexpected empty window physical
expression")
})?;
+<<<<<<< HEAD
Review comment:
@jorgecarleitao It looks like some merge conflicts got committed in this
PR
--
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]
