engine-q merge

2025-08-18 19:59:16 +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/vcf.rs
+++ b/crates/nu-command/tests/format_conversions/vcf.rs
@@ -70,7 +70,11 @@ 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