Remove old nushell/merge engine-q

2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
--- a/crates/nu-command/tests/format_conversions/xlsx.rs
+++ b/crates/nu-command/tests/format_conversions/xlsx.rs
@ -22,12 +22,8 @@ fn from_excel_file_to_table_select_sheet() {
        r#"
            open sample_data.xlsx --raw
            | from xlsx -s ["SalesOrders"]
-<<<<<<< HEAD
-            | get
-=======
            | columns
            | get 0
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
        "#
    ));