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/main.rs
+++ b/crates/nu_plugin_inc/src/main.rs
@ -1,6 +1,14 @@
+<<<<<<< HEAD
 use nu_plugin::serve_plugin;
 use nu_plugin_inc::Inc;

 fn main() {
    serve_plugin(&mut Inc::new())
+=======
+use nu_plugin::{serve_plugin, CapnpSerializer};
+use nu_plugin_inc::Inc;
+
+fn main() {
+    serve_plugin(&mut Inc::new(), CapnpSerializer {})
+>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 }