-fix conflict

2 files changed, 1 insertions, 2 deletions

diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index 07bf30de9..0d95cddfb 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -211,7 +211,7 @@ handle_lookup_block_it (void *cls,
  * Handles a #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK message
  *
  * @param cls a `struct NamecacheClient *`
- * @param the inbound message
+ * @param ln_msg the inbound message
  */
 static void
 handle_lookup_block (void *cls,
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 70c848037..5e820f8cc 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -259,7 +259,6 @@ handle_lookup_block_response (void *cls,
  *
  * @param cls the `struct GNUNET_NAMECACHE_Handle`
  * @param msg the message we received
- * @param size the message size
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
  */
 static void