Skip to content

Commit f6d80fa

Browse files
committed
resolve conflicts
1 parent 5832449 commit f6d80fa

File tree

5 files changed

+120
-53
lines changed

5 files changed

+120
-53
lines changed

Cargo.lock

Lines changed: 84 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ arrow = { version = "57.1.0", features = [
9494
"prettyprint",
9595
"chrono-tz",
9696
] }
97-
arrow-avro = { version = "57.0.0", default-features = false, features = [
97+
arrow-avro = { version = "57.1.0", default-features = false, features = [
9898
"deflate",
9999
"snappy",
100100
"zstd",

datafusion/datasource-avro/src/avro_to_arrow/arrow_array_reader.rs

Whitespace-only changes.

datafusion/datasource-avro/src/avro_to_arrow/schema.rs

Whitespace-only changes.

0 commit comments

Comments
 (0)