engine-q merge

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_plugin_inc/src/lib.rs
+++ b/crates/nu_plugin_inc/src/lib.rs
@ -2,6 +2,7 @@ mod inc;
 mod nu;

 pub use inc::Inc;
+<<<<<<< HEAD

 #[cfg(test)]
 mod tests {
@ -33,3 +34,5 @@ mod tests {
        }
    }
 }
+=======
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce