diff options
author | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
---|---|---|
committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
commit | a67786078bb3617ea8d4d308b21781fd0a1c2258 (patch) | |
tree | 67d476fe3e096001997f6de77d1db92bcd643bbb /src/exchangedb | |
parent | 8674f32aec8113ced6b2c2be625728b31158fff8 (diff) | |
download | exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.xz |
resolves merge conflicts
Diffstat (limited to 'src/exchangedb')
-rw-r--r-- | src/exchangedb/test_exchangedb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index ad61d96f7..7895aacad 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -531,7 +531,7 @@ handle_link_data_cb (void *cls, break; } } - //FIXME: + // FIXME: GNUNET_assert (GNUNET_NO != found); } } @@ -1690,7 +1690,7 @@ run (void *cls) struct TALER_CoinSpendPublicKeyP coin_pub; struct TALER_AgeHash age_hash; struct TALER_AgeHash *p_ah[2] = {NULL, &age_hash}; - //FIXME: + // FIXME: /* Call TALER_denom_blind()/TALER_denom_sign_blinded() twice, once without * age_hash, once with age_hash */ RND_BLK (&age_hash); |