Remove old nushell/merge engine-q

2025-08-09 01:15:14 +02:00 · 2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
--- a/tests/shell/environment/mod.rs
+++ b/tests/shell/environment/mod.rs
@ -1,10 +1,4 @@
-<<<<<<< HEAD
-mod configuration;
 mod env;
-mod in_sync;
-=======
-mod env;
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 mod nu_env;

 pub mod support {