[libmicrohttpd] branch master updated: Fixed merge conflict introduced by 32eae456fddba5b48d08f44dda956a0ea1ffffea

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new ede33803 Fixed merge conflict introduced by 
32eae456fddba5b48d08f44dda956a0ea1ffffea
ede33803 is described below

commit ede33803c6952a42d65cef9e351bc30ea2cea91d
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Wed Nov 8 20:32:53 2023 +0300

    Fixed merge conflict introduced by 32eae456fddba5b48d08f44dda956a0ea1ffffea
---
 src/microhttpd/daemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index d8151bea..9fc7ac0b 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -4627,8 +4627,8 @@ MHD_run_from_select2 (struct MHD_Daemon *daemon,
     MHD_DLOG (daemon,
               _ ("%s() called with fd_setsize (%u) " \
                  "less than fixed FD_SETSIZE value (%d) used on the " \
-                 "platform.\n", "MHD_run_from_select2"),
-              fd_setsize, (int) FD_SETSIZE);
+                 "platform.\n"),
+              "MHD_run_from_select2", fd_setsize, (int) FD_SETSIZE);
 #endif /* HAVE_MESSAGES */
     return MHD_NO;
   }

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