Skip to content

Commit da7d51a

Browse files
committed
test: remove avro sqllogictest conflict marker
1 parent 7958154 commit da7d51a

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

  • datafusion/sqllogictest/test_files

datafusion/sqllogictest/test_files/avro.slt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ SELECT id, string_col, int_col, bigint_col FROM alltypes_plain ORDER BY id LIMIT
285285
3 1 1 10
286286
4 0 0 0
287287

288-
<<<<<<< HEAD
289288
# projection should follow column names even when external table column order differs
290289
query TB
291290
SELECT string_col, bool_col FROM alltypes_plain_reordered ORDER BY id LIMIT 2

0 commit comments

Comments
 (0)