fix: merge errors

This commit is contained in:
Jonathan Kelley committed 2022-12-25 23:39:28 -05:00
1 parent 98aa80d0c7
commit 230c83c35b
3 files changed
+17 -13

No files matched your search

+13 -13
View File
@@ -1,3 +1,5 @@
use std::process::exit;
use super::*; use super::*;
/// Build the Rust WASM app and all of its assets. /// Build the Rust WASM app and all of its assets.
@@ -61,16 +63,14 @@ rsx! {
dbg!(out); dbg!(out);
} }
/* // parse the whole doc
parse the whole doc // find all the comment blocks
find all the comment blocks //
//
//
//
//
//
//
//
//
*/
+2
View File
@@ -83,6 +83,8 @@ impl Commands {
Commands::Clean(_) => "clean", Commands::Clean(_) => "clean",
Commands::Config(_) => "config", Commands::Config(_) => "config",
Commands::Plugin(_) => "plugin", Commands::Plugin(_) => "plugin",
Commands::Version(_) => "version",
Commands::Autoformat(_) => "fmt",
} }
.to_string() .to_string()
} }
+2
View File
@@ -1,3 +1,5 @@
use std::process::exit;
use super::*; use super::*;
/// Build the Rust WASM app and all of its assets. /// Build the Rust WASM app and all of its assets.