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/path/parse.rs
+++ b/crates/nu-command/tests/commands/path/parse.rs
@ -114,11 +114,8 @@ fn parses_column_path_extension() {
    assert_eq!(actual.out, "png");
 }

-<<<<<<< HEAD
-=======
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn parses_into_correct_number_of_columns() {
    let actual = nu!(