- Revert accidental commit.

diff --git a/run-tests.php b/run-tests.php
index 8ab0fac890bbd0ec3a1f81afeb48e71e14128aa0..2546d028551025cad906ad130e09dcdd1e713c53 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -189,11 +189,7 @@ $ini_overwrites = array(
                'safe_mode=0',
                'disable_functions=',
                'output_buffering=Off',
-<<<<<<< run-tests.php
-               'error_reporting=32767', /* E_ALL | E_STRICT */
-=======
                'error_reporting=' . (E_ALL | E_STRICT),
->>>>>>> 1.367
                'display_errors=1',
                'display_startup_errors=1',
                'log_errors=0',