adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bad merge.

Browse source
This commit is contained in:
mark_story 2011-12-03 13:56:55 -05:00
parent 73de68f5f4
commit 545f4d2811
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Console/Command/TestsuiteShell.php
View file

@ -30,18 +30,7 @@ App::uses('CakeTestLoader', 'TestSuite');
* *
* @package Cake.Console.Command * @package Cake.Console.Command
*/ */
<<<<<<< HEAD
class TestsuiteShell extends TestShell { 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. * get the option parser for the test suite.