diff options
| author | valmat <ufabiz@gmail.com> | 2014-04-09 11:00:05 +0600 |
|---|---|---|
| committer | valmat <ufabiz@gmail.com> | 2014-04-09 11:00:05 +0600 |
| commit | 6c7c846edd5b74450b76532da33c25e6cc6a10a4 (patch) | |
| tree | 51b0e0be5c43ddba6ca9351026fc94bf8ae7bc07 /tests | |
| parent | 08ed8866a5bba0b23a8d5587116a968512df2568 (diff) | |
| parent | 33760c3efba4207eac826ff080b5f9b9672fc60e (diff) | |
Merge branch 'master' into ini-master
Conflicts:
include/namespace.h
zend/extensionimpl.cpp
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/php/phpt/variables/021-HashMember-3.phpt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/php/phpt/variables/021-HashMember-3.phpt b/tests/php/phpt/variables/021-HashMember-3.phpt index c6c517f..20f43ba 100644 --- a/tests/php/phpt/variables/021-HashMember-3.phpt +++ b/tests/php/phpt/variables/021-HashMember-3.phpt @@ -22,6 +22,5 @@ array ( 'key1' => array ( 'key2' => 'val1-2', - 'key3' => 'val1-3', ), )
\ No newline at end of file |