rebase

FuelLabs · Jun 19, 2024 · 5b6f6ae · 5b6f6ae
1 parent 3f6e56d
commit 5b6f6ae
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/commands/toolchain.rs b/src/commands/toolchain.rs
@@ -1,6 +1,4 @@
-use crate::ops::fuelup_toolchain::{
-    install::install, new::new, uninstall::uninstall,
-};
+use crate::ops::fuelup_toolchain::{install::install, new::new, uninstall::uninstall};
 use crate::target_triple::TargetTriple;
 use crate::toolchain::RESERVED_TOOLCHAIN_NAMES;
 use anyhow::{bail, Result};
@@ -62,10 +60,6 @@ pub fn exec(command: ToolchainCommand) -> Result<()> {
         ToolchainCommand::Install(command) => install(command)?,
         ToolchainCommand::New(command) => new(command)?,
         ToolchainCommand::Uninstall(command) => uninstall(command)?,
-<<<<<<< HEAD
-=======
-        ToolchainCommand::ListRevisions => list_revisions()?,
->>>>>>> c78adb1 (clippy)
     };
 
     Ok(())