[taler-donau] branch master updated: clean merge conflict - change comment

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new d68b6cf  clean merge conflict - change comment
d68b6cf is described below

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

    clean merge conflict - change comment
---
 src/include/donau_crypto_lib.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h
index 3fc644f..32a7500 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.