donau

commit d68b6cf07e48a0dd9f81255e8641db89faba399d
parent 4611663d55b9d9fd08a9d0344d7dc92deb20dcd5
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date:   Sun,  7 Jan 2024 20:02:23 +0100

clean merge conflict - change comment

Diffstat:
M
src/include/donau_crypto_lib.h
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h
@@ -119,7 +119,6 @@ struct DONAU_DonationUnitHashP
 };
 
 /**
-<<<<<<< HEAD
  * Compare two donation unit public keys.
  *
  * @param donation_unit1 first key