fix: fix test

apache · Aug 2, 2024 · 96c0552 · 96c0552
1 parent f38b363
commit 96c0552
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/datafusion/sqllogictest/test_files/string_view.slt b/datafusion/sqllogictest/test_files/string_view.slt
@@ -321,7 +321,6 @@ logical_plan
 02)--Filter: CAST(test.column2_utf8 AS Utf8View) = test.column1_utf8view
 03)----TableScan: test projection=[column1_utf8, column2_utf8, column1_utf8view]
 
-<<<<<<< HEAD
 ## Test distinct aggregates
 query III
 SELECT
@@ -356,7 +355,6 @@ logical_plan
 01)Aggregate: groupBy=[[]], aggr=[[count(DISTINCT test.column1_utf8), count(DISTINCT test.column1_utf8view), count(DISTINCT test.column1_dict)]]
 02)--TableScan: test projection=[column1_utf8, column1_utf8view, column1_dict]
 
-=======
 query TT
 EXPLAIN SELECT
   STARTS_WITH(column1_utf8view, 'foo') as c,
@@ -366,7 +364,6 @@ FROM test;
 logical_plan
 01)Projection: starts_with(test.column1_utf8view, Utf8View("foo")) AS c, starts_with(test.column1_utf8view, test.column2_utf8view) AS c2
 02)--TableScan: test projection=[column1_utf8view, column2_utf8view]
->>>>>>> 222263c15 (simplify string view handling)
 
 statement ok
 drop table test;
@@ -388,6 +385,5 @@ select t.dt from dates t where arrow_cast('2024-01-01', 'Utf8View') < t.dt;
 ----
 2024-01-23
 
-
 statement ok
 drop table dates;