diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
| commit | 9374977d215be414d6e2e98b041a2b8f9b9a1e8d (patch) | |
| tree | 15b28cb867460a81ac1956cd8c241cd23e1c9827 /php.ini-development | |
| parent | c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd (diff) | |
| parent | 940c68b55d4241f9f34d4f71064f5f12a44e8d3d (diff) | |
| download | php-git-9374977d215be414d6e2e98b041a2b8f9b9a1e8d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/php.ini-development b/php.ini-development index 801c1b63d4..2224309925 100644 --- a/php.ini-development +++ b/php.ini-development @@ -956,10 +956,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = |