Remove old nushell/merge engine-q

2025-08-09 10:25:42 +02:00 · 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/vcf.rs
+++ b/crates/nu-command/tests/format_conversions/vcf.rs
@ -70,11 +70,7 @@ fn from_vcf_text_to_table() {
            r#"
                open contacts.txt
                | from vcf
-<<<<<<< HEAD
-                | get properties
-=======
                | get properties.0
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
                | where name == "EMAIL"
                | first
                | get value