From fb2d20eeba5efcfb8c4607b61c028a3339406841 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Thu, 24 Jul 2008 21:39:23 +0000 Subject: [PATCH] - Revert accidental commit. --- run-tests.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/run-tests.php b/run-tests.php index 8ab0fac890b..2546d028551 100755 --- 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',