Skip to content

Commit 598bb2c

Browse files
committed
fix bad merge
1 parent bb513f1 commit 598bb2c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

acinclude.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3099,7 +3099,6 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [
30993099
31003100
])
31013101

3102-
<<<<<<< HEAD
31033102
dnl PHP_CHECK_BUILTIN_SMULL_OVERFLOW
31043103
AC_DEFUN([PHP_CHECK_BUILTIN_SMULL_OVERFLOW], [
31053104
AC_MSG_CHECKING([for __builtin_smull_overflow])

0 commit comments

Comments
 (0)