[taler-sync] 02/02: adjust sync to API changes and to work with claim tokens: merge

[gnunet]

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

grothoff pushed a commit to branch master
in repository sync.

commit 91e97e81c390bd691dbedad654887dfbd9412351
Merge: 989f867 41b108b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Aug 19 15:28:09 2020 +0200

    adjust sync to API changes and to work with claim tokens: merge

 src/testing/testing_api_cmd_backup_upload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/testing/testing_api_cmd_backup_upload.c
index 7c87306,4f0b159..6a37ffb
--- a/src/testing/testing_api_cmd_backup_upload.c
+++ b/src/testing/testing_api_cmd_backup_upload.c
@@@ -331,8 -345,7 +331,8 @@@ backup_upload_run (void *cls
                           bus->sync_url,
                           &bus->sync_priv,
                           ( ( (NULL != bus->prev_upload) &&
-                              (GNUNET_YES != GNUNET_is_zero (
 -                             (GNUNET_NO == GNUNET_is_zero (&bus->prev_hash)) 
) ||
++                             (GNUNET_NO == GNUNET_is_zero (
 +                                &bus->prev_hash)) ) ||
                             (0 != (SYNC_TESTING_UO_PREV_HASH_WRONG
                                    & bus->uopt)) )
                           ? &bus->prev_hash

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