com php-src: Fix merge error: Zend/zend_language_parser.y

From: Date: Tue, 10 Feb 2015 15:48:08 +0000
Subject: com php-src: Fix merge error: Zend/zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85716@lists.php.net to get a copy of this message
Commit: cbbaea08da8363358fa2257f7b441ab9d148aae4 Author: Andrea Faulds <ajf@ajf.me> Thu, 29 Jan 2015 18:07:25 +0000 Parents: 0af3b7c017264d6f5264dc7e284478a3c70f6bd7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cbbaea08da8363358fa2257f7b441ab9d148aae4 Log: Fix merge error Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3671ead..009d7ba 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -573,7 +573,7 @@ optional_type: ; type: - | T_ARRAY { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); } + T_ARRAY { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); } | T_CALLABLE { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); } | name { $$ = $1; } ;

« previous php.cvs (#85716) next »