diff options
| author | DiederikLascaris <info@runesa.nl> | 2017-01-22 21:45:15 +0100 |
|---|---|---|
| committer | DiederikLascaris <info@runesa.nl> | 2017-01-22 21:45:15 +0100 |
| commit | 312efeba32d532878c536fd28e75f39d61a9dade (patch) | |
| tree | 71ae4aaca33a9d34a789d6d375acd2594160123a /tests/Bootstrap.php | |
| parent | 947f1a06093a52a32b703ee795e52c22cd66363a (diff) | |
| parent | 44c7af639ac1726780b64fb5a6cb6fca2df8b651 (diff) | |
Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'tests/Bootstrap.php')
| -rw-r--r-- | tests/Bootstrap.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 8240d2340..b4e56bdae 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -1,10 +1,4 @@ <?php -// For some reason, setting this fixes the 5.2 tests but breaks the 5.3 ones ... -if (version_compare(PHP_VERSION, '5.3.0', '<')) -{ - ini_set('memory_limit', '128M'); -} - // Errors on full! ini_set('display_errors', 1); error_reporting(E_ALL | E_STRICT); |