fix bad merge

diff --git a/acinclude.m4 b/acinclude.m4
index 61de6cbacb7c6ecb3b9e64347e3b906549dd94a5..dc75c0acab13bd4eae48fbca1f92edf2b6978e0a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3099,7 +3099,6 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [
 
 ])
 
-<<<<<<< HEAD
 dnl PHP_CHECK_BUILTIN_SMULL_OVERFLOW
 AC_DEFUN([PHP_CHECK_BUILTIN_SMULL_OVERFLOW], [
   AC_MSG_CHECKING([for __builtin_smull_overflow])