From 545f4d281141951565834c02745a4994c087e749 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 3 Dec 2011 13:56:55 -0500
Subject: [PATCH] Fix bad merge.

---
 lib/Cake/Console/Command/TestsuiteShell.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/Cake/Console/Command/TestsuiteShell.php b/lib/Cake/Console/Command/TestsuiteShell.php
index 660dfcb87..39d54962a 100644
--- a/lib/Cake/Console/Command/TestsuiteShell.php
+++ b/lib/Cake/Console/Command/TestsuiteShell.php
@@ -30,18 +30,7 @@ App::uses('CakeTestLoader', 'TestSuite');
  *
  * @package       Cake.Console.Command
  */
-<<<<<<< HEAD
 class TestsuiteShell extends TestShell {
-=======
-class TestsuiteShell extends AppShell {
-
-/**
- * Dispatcher object for the run.
- *
- * @var CakeTestDispatcher
- */
-	protected $_dispatcher = null;
->>>>>>> 2.0
 
 /**
  * get the option parser for the test suite.