Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix bad merge.

  • Loading branch information...
commit 545f4d281141951565834c02745a4994c087e749 1 parent 73de68f
@markstory markstory authored
Showing with 0 additions and 11 deletions.
  1. +0 −11 lib/Cake/Console/Command/TestsuiteShell.php
View
11 lib/Cake/Console/Command/TestsuiteShell.php
@@ -30,18 +30,7 @@
*
* @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.
Please sign in to comment.
Something went wrong with that request. Please try again.