Skip to content

Commit

Permalink
Update main.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
balakreddy authored Jul 12, 2024
1 parent 41c34d9 commit 15eb319
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,9 @@ async fn provision() -> Result<(), anyhow::Error> {
)?;

// Add user for the passwordless sudo
<<<<<<< HEAD
<<<<<<< HEAD
user::add_user_for_passwordless_sudo(
username.as_str())
.with_context(|| format!(
"Unable to add user for the passwordless sudo '{username}'"))?;
=======
user::add_user_for_passwordless_sudo(username.as_str()).with_context(
|| format!("Unable to add user for the passwordless sudo '{username}'"),
)?;
>>>>>>> 20f9d3f (Enable passwordless sudo for the user)
=======
user::add_user_for_passwordless_sudo(username.as_str()).with_context(
|| format!("Unable to add user for the passwordless sudo '{username}'"),
)?;
>>>>>>> b523371 (Enable passwordless sudo for the user)

user::set_ssh_keys(instance_metadata.compute.public_keys, &username)
.with_context(|| "Failed to write ssh public keys.")?;
Expand Down

0 comments on commit 15eb319

Please sign in to comment.