Unmangle

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index d3044f3dfef2a893ec7b8f5465b1e8ae61e5e419..468e8d51cc8bfce7082f5610d50401f4fdb52bb5 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,16 +1,4 @@
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
-=======
-/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
->>>>>>> 1.1.2.10
-=======
-/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
->>>>>>> 1.1.2.12
-=======
 /* Generated by re2c 0.13.6.dev on Mon Feb  2 19:23:18 2009 */
->>>>>>> 1.1.2.15
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -34,19 +22,7 @@
    +----------------------------------------------------------------------+
 */
 
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
 /* $Id$ */
-=======
-/* $Id$ */
->>>>>>> 1.1.2.10
-=======
-/* $Id$ */
->>>>>>> 1.1.2.12
-=======
-/* $Id$ */
->>>>>>> 1.1.2.15
 
 #include <errno.h>
 #include "zend.h"

diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 9f0684d3dfb6190040dd2263a04b8d5493691663..46676e897b72a33f7eac34dd8ea603dbd667e4a8 100644 (file)
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,16 +1,4 @@
-<<<<<<< zend_ini_scanner_defs.h
-<<<<<<< zend_ini_scanner_defs.h
-<<<<<<< zend_ini_scanner_defs.h
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
-=======
-/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
->>>>>>> 1.1.2.8
-=======
-/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
->>>>>>> 1.1.2.10
-=======
 /* Generated by re2c 0.13.6.dev on Mon Feb  2 19:23:18 2009 */
->>>>>>> 1.1.2.12
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 9df1bf44ec0d9a7e55d65be0f89ca7ba9778d16d..7f14dc72e3973596ab734de314f5bdce68394e64 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,12 +1,4 @@
-<<<<<<< zend_language_scanner.c
-<<<<<<< zend_language_scanner.c
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
-=======
-/* Generated by re2c 0.13.6.dev on Tue Nov  4 01:40:34 2008 */
->>>>>>> 1.1.2.28
-=======
 /* Generated by re2c 0.13.5 on Fri Jan  9 12:08:49 2009 */
->>>>>>> 1.1.2.31
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -31,15 +23,7 @@
    +----------------------------------------------------------------------+
 */
 
-<<<<<<< zend_language_scanner.c
-<<<<<<< zend_language_scanner.c
 /* $Id$ */
-=======
-/* $Id$ */
->>>>>>> 1.1.2.28
-=======
-/* $Id$ */
->>>>>>> 1.1.2.31
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 6b18749ea31e5ffa8b27e8c4f1f144593f69694b..e3d556fdaf6dfb8229c250ec1a29d879ce3119b4 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,12 +1,4 @@
-<<<<<<< zend_language_scanner_defs.h
-<<<<<<< zend_language_scanner_defs.h
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
-=======
-/* Generated by re2c 0.13.6.dev on Tue Nov  4 01:40:34 2008 */
->>>>>>> 1.1.2.20
-=======
 /* Generated by re2c 0.13.5 on Fri Jan  9 12:08:49 2009 */
->>>>>>> 1.1.2.21
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {