From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 14 Feb 2009 21:20:16 +0000 (+0000)
Subject: Unmangle
X-Git-Tag: RELEASE_1_3_5~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8eea99840626da8476b6bec37514085081ba3c81;p=php

Unmangle
---

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index d3044f3dfe..468e8d51cc 100644
--- 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 9f0684d3df..46676e897b 100644
--- 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 9df1bf44ec..7f14dc72e3 100644
--- 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 6b18749ea3..e3d556fdaf 100644
--- 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 {