Fix CI compile failure due to merge conflict - #13219

Fix CI compile failure due to merge conflict#13219

alamb merged 1 commit into

apache:mainapache/datafusion:mainfrom

alamb:alamb/fix_merge_conflictalamb/datafusion:alamb/fix_merge_conflictCopy head branch name to clipboard