engine-q merge

2025-08-14 18:59:06 +02:00 · 2022-02-07 19:11:34 +00:00
parent 265ee1281d 9259a56a28
commit fdce6c49ab
1965 changed files with 119062 additions and 20 deletions
--- a/crates/nu-command/tests/format_conversions/ods.rs
+++ b/crates/nu-command/tests/format_conversions/ods.rs
@ -22,7 +22,12 @@ fn from_ods_file_to_table_select_sheet() {
        r#"
            open sample_data.ods --raw
            | from ods -s ["SalesOrders"]
+<<<<<<< HEAD
            | get
+=======
+            | columns
+            | get 0
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
        "#
    ));