Remove old nushell/merge engine-q

crates/nu_plugin_inc/src/lib.rs

@@ -2,37 +2,3 @@ mod inc;
 mod nu;
 
 pub use inc::Inc;
-<<<<<<< HEAD
-
-#[cfg(test)]
-mod tests {
-    use super::Inc;
-    use crate::inc::Action;
-    use nu_protocol::Value;
-    use nu_value_ext::ValueExt;
-
-    impl Inc {
-        pub fn expect_action(&self, action: Action) {
-            match &self.action {
-                Some(set) if set == &action => {}
-                Some(_) => panic!("\nUnexpected action"),
-                None => panic!("\nAction not found."),
-            }
-        }
-
-        pub fn expect_field(&self, field: Value) {
-            let field = match field.as_column_path() {
-                Ok(column_path) => column_path,
-                Err(_) => panic!("\nExpected a ColumnPath",),
-            };
-
-            match &self.field {
-                Some(column_path) if column_path == &field => {}
-                Some(_) => panic!("\nUnexpected field."),
-                None => panic!("\nField not found."),
-            }
-        }
-    }
-}
-=======
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce