diff options
| author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
|---|---|---|
| committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
| commit | c9562b8cf7a29f4ec2457cb9d9d4530c24225da1 (patch) | |
| tree | fb7d0296af5537ddda7e772a46e959c8ed64fbac /src/transport/transport_api_core.c | |
| parent | 9173da4f8c1f4b50ccd9d61f6fa138904740ecfa (diff) | |
| parent | d748b0c920b0581ca65962f34d1f2e94c9a89926 (diff) | |
| download | gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.tar.gz gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.zip | |
-fix conflict
Diffstat (limited to 'src/transport/transport_api_core.c')
| -rw-r--r-- | src/transport/transport_api_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c index 0ffaeb444..12612de09 100644 --- a/src/transport/transport_api_core.c +++ b/src/transport/transport_api_core.c | |||
| @@ -713,7 +713,7 @@ handle_recv (void *cls, const struct InboundMessage *im) | |||
| 713 | * Function we use for handling incoming set quota messages. | 713 | * Function we use for handling incoming set quota messages. |
| 714 | * | 714 | * |
| 715 | * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *` | 715 | * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *` |
| 716 | * @param msg message received | 716 | * @param qm message received |
| 717 | */ | 717 | */ |
| 718 | static void | 718 | static void |
| 719 | handle_set_quota (void *cls, const struct QuotaSetMessage *qm) | 719 | handle_set_quota (void *cls, const struct QuotaSetMessage *qm) |