From 681bf929d71c74c16dc7335b540250ff5fb6f985 Mon Sep 17 00:00:00 2001 From: Saksham Bhalla Date: Tue, 14 Jan 2025 15:33:41 -0800 Subject: [PATCH] fix whitespace diffs after manual merge conflict --- auth/kerberos/src/krb.cpp | 2 +- common/daemon.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/auth/kerberos/src/krb.cpp b/auth/kerberos/src/krb.cpp index f6f10af3..17bae4f1 100644 --- a/auth/kerberos/src/krb.cpp +++ b/auth/kerberos/src/krb.cpp @@ -631,4 +631,4 @@ std::vector delete_krb_tickets( std::string krb_files_dir, std::str return delete_krb_ticket_paths; } return delete_krb_ticket_paths; -} \ No newline at end of file +} diff --git a/common/daemon.h b/common/daemon.h index 70208666..1f725555 100644 --- a/common/daemon.h +++ b/common/daemon.h @@ -257,7 +257,6 @@ std::string generate_lease_id(); void clearString( std::string& str ); - #if AMAZON_LINUX_DISTRO std::string retrieve_credspec_from_s3( std::string s3_arn, std::string region,