Skip to content

Commit

Permalink
fix: fix wrong merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuliquan committed Dec 4, 2024
1 parent 520f3ad commit 0de7a4f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion datafusion/proto/src/physical_plan/to_proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use datafusion::physical_expr::window::{SlidingAggregateWindowExpr, StandardWind
use datafusion::physical_expr::{LexOrdering, PhysicalSortExpr, ScalarFunctionExpr};
use datafusion::physical_plan::expressions::{
BinaryExpr, CaseExpr, CastExpr, Column, InListExpr, IsNotNullExpr, IsNullExpr,
Literal, NegativeExpr, NotExpr, NthValue, ScalarRegexMatchExpr, TryCastExpr, UnKnownColumn,
Literal, NegativeExpr, NotExpr, ScalarRegexMatchExpr, TryCastExpr, UnKnownColumn,
};
use datafusion::physical_plan::udaf::AggregateFunctionExpr;
use datafusion::physical_plan::windows::{PlainAggregateWindowExpr, WindowUDFExpr};
Expand Down

0 comments on commit 0de7a4f

Please sign in to comment.