From 2dadc77e99fb56feca1c49353f3808041d36cb32 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 14 Aug 2012 19:00:57 +1200
Subject: [PATCH] Revert "Make PHPUnit bootstrap add flush=1"

This reverts commit e0037967c2f1efe23002ba8a87ce147683066167.

Conflicts:

	tests/travis/_ss_environment.php
---
 tests/bootstrap.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e4a887ad7..1904a068f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -20,7 +20,6 @@ if (!$_SERVER) $_SERVER = array();
 $frameworkPath = dirname(dirname(__FILE__));
 $frameworkDir = basename($frameworkPath);
 
-$_GET['flush'] = 1;
 $_SERVER['SCRIPT_FILENAME'] = $frameworkPath . DIRECTORY_SEPARATOR . 'cli-script.php';
 $_SERVER['SCRIPT_NAME'] = '.' . DIRECTORY_SEPARATOR . $frameworkDir . DIRECTORY_SEPARATOR . 'cli-script.php'; 
 
@@ -71,4 +70,4 @@ if(!isset($_GET['flush']) || !$_GET['flush']) {
 		"Add flush=1 as an argument to discover new classes or files.\n",
 		false
 	);
-}
+}
\ No newline at end of file