Skip to content

Commit 0de7a4f

Browse files
committed
fix: fix wrong merge conflict
1 parent 520f3ad commit 0de7a4f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

datafusion/proto/src/physical_plan/to_proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use datafusion::physical_expr::window::{SlidingAggregateWindowExpr, StandardWind
2323
use datafusion::physical_expr::{LexOrdering, PhysicalSortExpr, ScalarFunctionExpr};
2424
use datafusion::physical_plan::expressions::{
2525
BinaryExpr, CaseExpr, CastExpr, Column, InListExpr, IsNotNullExpr, IsNullExpr,
26-
Literal, NegativeExpr, NotExpr, NthValue, ScalarRegexMatchExpr, TryCastExpr, UnKnownColumn,
26+
Literal, NegativeExpr, NotExpr, ScalarRegexMatchExpr, TryCastExpr, UnKnownColumn,
2727
};
2828
use datafusion::physical_plan::udaf::AggregateFunctionExpr;
2929
use datafusion::physical_plan::windows::{PlainAggregateWindowExpr, WindowUDFExpr};

0 commit comments

Comments
 (0)