fixed merge conflict
This commit is contained in:
@@ -15,6 +15,7 @@ mod rfs;
|
||||
mod vault;
|
||||
mod text;
|
||||
mod zinit;
|
||||
mod mycelium;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
@@ -95,6 +96,9 @@ pub use git::register_git_module;
|
||||
// Re-export zinit module
|
||||
pub use zinit::register_zinit_module;
|
||||
|
||||
// Re-export mycelium module
|
||||
pub use mycelium::register_mycelium_module;
|
||||
|
||||
// Re-export text module
|
||||
pub use text::register_text_module;
|
||||
// Re-export text functions directly from text module
|
||||
@@ -155,6 +159,9 @@ pub fn register(engine: &mut Engine) -> Result<(), Box<rhai::EvalAltResult>> {
|
||||
// Register Zinit module functions
|
||||
zinit::register_zinit_module(engine)?;
|
||||
|
||||
// Register Mycelium module functions
|
||||
mycelium::register_mycelium_module(engine)?;
|
||||
|
||||
// Register Text module functions
|
||||
text::register_text_module(engine)?;
|
||||
|
||||
|
Reference in New Issue
Block a user