- Revert accidental commit.

18 years ago · fb2d20eeba
1 changed files with 0 additions and 4 deletions
--- 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',