Skip to content

Commit 20639fa

Browse files
committed
fix: clap version in sqllogictest
1 parent ebfedd0 commit 20639fa

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

datafusion/sqllogictest/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ async-trait = { workspace = true }
4545
bigdecimal = { workspace = true }
4646
bytes = { workspace = true, optional = true }
4747
chrono = { workspace = true, optional = true }
48-
<<<<<<< HEAD
49-
clap = { version = "4.5.50", features = ["derive", "env"] }
50-
=======
5148
clap = { version = "4.5.47", features = ["derive", "env"] }
52-
>>>>>>> origin/branch-50
5349
datafusion = { workspace = true, default-features = true, features = ["avro"] }
5450
datafusion-spark = { workspace = true, default-features = true }
5551
datafusion-substrait = { workspace = true, default-features = true }

0 commit comments

Comments
 (0)