Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Removed leftovers of a merge conflict in example #1069

Merged
merged 1 commit into from
Jun 13, 2022
Merged

Removed leftovers of a merge conflict in example #1069

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions examples/parquet_write_parallel/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,7 @@ fn create_batch(size: usize) -> Result<Chunk> {
})
.collect();

<<<<<<< HEAD
Chunk::try_new(vec![c1.arced(), c2.arced()])
=======
Chunk::try_new(vec![
Box::new(c1) as Box<dyn Array>,
Box::new(c2) as Box<dyn Array>,
])
>>>>>>> 619252ff0 (Arc->Box)
Chunk::try_new(vec![c1.boxed(), c2.boxed()])
}

fn main() -> Result<()> {
Expand Down