summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner_defs.h
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2009-02-14 21:20:16 +0000
committerRasmus Lerdorf <rasmus@php.net>2009-02-14 21:20:16 +0000
commit8eea99840626da8476b6bec37514085081ba3c81 (patch)
treec990b9c48537acf5d6596eb9f7b1aa2f66c1790d /Zend/zend_language_scanner_defs.h
parent70ecb3074a707a7c19b0900fc7bbac02a5b30149 (diff)
downloadphp-git-8eea99840626da8476b6bec37514085081ba3c81.tar.gz
Unmangle
Diffstat (limited to 'Zend/zend_language_scanner_defs.h')
-rw-r--r--Zend/zend_language_scanner_defs.h8
1 files changed, 0 insertions, 8 deletions
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 {