Remove conflict

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 2051235c7d0ac417c27d8f31a550d8165971158a..c83fd08e039127cd67f20c69c7c7d64d6cc7ebb2 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -33,13 +33,8 @@
 #include "ext/bcmath/number.h"
 #endif
 
-<<<<<<< zend_operators.c
-#define LONG_SIGN_MASK (1L << (8*SIZEOF_LONG-1))
-
-=======
 #define LONG_SIGN_MASK (1L << (8*sizeof(long)-1))
 
->>>>>>> 1.162
 ZEND_API int zend_atoi(const char *str, int str_len)
 {
        int retval;