Fix merge

2023-02-08 22:47:15 +01:00 · 2023-02-08 22:47:15 +01:00 · e169653783
commit e169653783
--- a/include/sane/config.h.in
+++ b/include/sane/config.h.in
@ -102,12 +102,9 @@
 /* Define to 1 if you have the `strtod' function. */
 #undef HAVE_STRTOD

-<<<<<<< HEAD
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H

-=======
->>>>>>> master
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H