1 files changed, 6 insertions, 0 deletions

diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index 95237f2a..c2d8ce33 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -229,9 +229,15 @@ _GL_INLINE_HEADER_BEGIN
 
 /* Declarations for ISO C N3322.  */
 #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+<<<<<<< HEAD
+_GL_EXTERN_C void *(bsearch) (const void *__key,
+                            const void *__base, size_t __nmemb, size_t __size,
+                            int (*__compare) (const void *, const void *))
+=======
 _GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
   (const void *__key, const void *__base, size_t __nmemb, size_t __size,
    int (*__compare) (const void *, const void *))
+>>>>>>> master
   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
 _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
                          int (*__compare) (const void *, const void *))