From a67786078bb3617ea8d4d308b21781fd0a1c2258 Mon Sep 17 00:00:00 2001
From: Gian Demarmels <gian@demarmels.org>
Date: Fri, 4 Feb 2022 16:50:32 +0100
Subject: resolves merge conflicts

---
 src/include/taler_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/include/taler_util.h')

diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 26440cb1d..f64811a46 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -444,7 +444,7 @@ TALER_yna_to_string (enum TALER_EXCHANGE_YesNoAll yna);
  * @param c the character to search for
  * @return char* the first occurence of `c` in `s`
  */
-char * strchrnul (const char *s, int c);
+char *strchrnul (const char *s, int c);
 
 #endif
 
-- 
cgit v1.2.3