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/commands/lines.rs
+++ b/crates/nu-command/tests/commands/lines.rs
@ -27,11 +27,7 @@ fn lines_proper_buffering() {
            open lines_test.txt -r
            | lines
            | str length
-<<<<<<< HEAD
-            | to json
-=======
            | to json -r
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
        "#
    ));

@ -50,9 +46,5 @@ fn lines_multi_value_split() {
        "#
    ));

-<<<<<<< HEAD
-    assert_eq!(actual.out, "5");
-=======
    assert_eq!(actual.out, "6");
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 }