fix whitespace diffs after manual merge conflict

aws · Jan 14, 2025 · 681bf92 · 681bf92
1 parent b53164d
commit 681bf92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/auth/kerberos/src/krb.cpp b/auth/kerberos/src/krb.cpp
@@ -631,4 +631,4 @@ std::vector<std::string> delete_krb_tickets( std::string krb_files_dir, std::str
         return delete_krb_ticket_paths;
     }
     return delete_krb_ticket_paths;
-}
+}
diff --git 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,
-Original file line number
+Diff line change
@@ Expand Up @@
             return delete_krb_ticket_paths;
         }
         return delete_krb_ticket_paths;
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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,
Expand Down