[taler-anastasis] 03/03: fixed merge issues

[gnunet]

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

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 5ee4f222e5b64d5fd486b20b04d0ee7fcebf8491
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Tue Jul 7 08:06:14 2020 +0000

    fixed merge issues
---
 src/cli/Makefile.am                | 4 ++--
 src/include/anastasis_crypto_lib.h | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 749ce4f..e7352b5 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -13,9 +13,9 @@ endif
 anastasis_splitter_SOURCES = \
   anastasis-cli-splitter.c
 anastasis_splitter_LDADD = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/lib/libanastasisrest.la \
   $(top_builddir)/src/lib/libanastasis.la \
-  $(top_builddir)/src/util/libanastasisutil.la \
   -ltalermerchant \
   -ltalerjson \
   -ltalerutil \
@@ -30,9 +30,9 @@ anastasis_splitter_LDADD = \
 anastasis_assembler_SOURCES = \
   anastasis-cli-assembler.c
 anastasis_assembler_LDADD = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/lib/libanastasisrest.la \
   $(top_builddir)/src/lib/libanastasis.la \
-  $(top_builddir)/src/util/libanastasisutil.la \
   -ltalermerchant \
   -ltalerjson \
   -ltalerutil \
diff --git a/src/include/anastasis_crypto_lib.h 
b/src/include/anastasis_crypto_lib.h
index ee3651c..a26c010 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -192,7 +192,6 @@ ANASTASIS_CRYPTO_user_identifier_derive (
  * The private key is used to sign the upload.
  * @param nonce is the seed to create and recreate the private key
  * @param pub_key[out] handle for the generated pub key
- * @param priv_key[out] handle for the generated priv key
  */
 void
 ANASTASIS_CRYPTO_truth_public_key_derive (

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