From f7e12647aae9898588025e3fd2a4e0f4b72552e7 Mon Sep 17 00:00:00 2001 From: Nathael Bonnal Date: Mon, 4 May 2026 10:09:21 +0200 Subject: [PATCH] hardfix: removal of the code that was preventing the build --- libs/ferriskey-cli-core/src/client.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/ferriskey-cli-core/src/client.rs b/libs/ferriskey-cli-core/src/client.rs index 06d0f13..42f660d 100644 --- a/libs/ferriskey-cli-core/src/client.rs +++ b/libs/ferriskey-cli-core/src/client.rs @@ -118,7 +118,7 @@ fn delete_client( let found = client .get_client(&realm, &args.client_id)? .ok_or_else(|| ClientCommandError::ClientNotFound(args.client_id.clone()))?; -<<<<<<< HEAD + let uuid = found .id .ok_or_else(|| ClientCommandError::ClientNotFound(args.client_id.clone()))?; @@ -127,11 +127,6 @@ fn delete_client( output_format, &format!("client '{}' deleted", args.client_id), ) -======= - let uuid = found.id.unwrap_or_default(); - client.delete_client(&realm, &uuid)?; - render_message(output_format, &format!("client '{}' deleted", args.client_id)) ->>>>>>> f51dda6 (feat: implement delete client) } fn get_client(