From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 16:34:20 +0000 (+0000)
Subject: fix bad merge
X-Git-Tag: php-7.2.0alpha1~611
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=598bb2cad8ba1163ae1ca73272c131a654daed70;p=php

fix bad merge
---

diff --git a/acinclude.m4 b/acinclude.m4
index 61de6cbacb..dc75c0acab 100644
--- 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])