[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 02/03: fix merge conflict
From: |
gnunet |
Subject: |
[taler-anastasis] 02/03: fix merge conflict |
Date: |
Wed, 14 Oct 2020 15:43:00 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit a17fb8ba5544b460de47789acd851cbe1d864bb9
Merge: 07cabf7 234feb8
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Oct 14 15:37:54 2020 +0200
fix merge conflict
src/lib/anastasis_api_backup_redux.c | 30 +++++++++++++++++-------------
src/lib/anastasis_api_recovery_redux.c | 14 +++++++-------
src/lib/anastasis_api_redux.c | 2 +-
3 files changed, 25 insertions(+), 21 deletions(-)
diff --cc src/lib/anastasis_api_backup_redux.c
index c6de773,726b9fb..9cfde59
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@@ -519,13 -522,13 +522,13 @@@ add_policy (json_t *state
* @param cb function to call with the result
* @param cb_cls closure for @a cb
*/
- void
+ struct ANASTASIS_ReduxAction *
-ANASTASIS_backup_action (struct GNUNET_CURL_Context *ctx,
- json_t *state,
- const char *action,
- const json_t *arguments,
- ANASTASIS_ActionCallback cb,
- void *cb_cls)
+ANASTASIS_backup_action_ (struct GNUNET_CURL_Context *ctx,
+ json_t *state,
+ const char *action,
+ const json_t *arguments,
+ ANASTASIS_ActionCallback cb,
+ void *cb_cls)
{
struct Dispatcher
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.