fix conflict

Signed-off-by: silverbullet233 <[email protected]>
StarRocks · Jan 7, 2025 · 8c3c1df · 8c3c1df
1 parent 85e57db
commit 8c3c1df
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/SelectNode.java b/fe/fe-core/src/main/java/com/starrocks/planner/SelectNode.java
@@ -36,12 +36,8 @@
 
 import com.starrocks.analysis.Analyzer;
 import com.starrocks.analysis.Expr;
-<<<<<<< HEAD
-import com.starrocks.common.UserException;
-=======
 import com.starrocks.analysis.SlotId;
-import com.starrocks.common.StarRocksException;
->>>>>>> e66fcdb8ad ([Enhancement] support common expr reuse strategy on scan predicates (#52889))
+import com.starrocks.common.UserException;
 import com.starrocks.thrift.TExplainLevel;
 import com.starrocks.thrift.TPlanNode;
 import com.starrocks.thrift.TPlanNodeType;