adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolving conflict left out in previous commit

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2011-02-13 23:42:41 -04:30
parent c1e81a20cd
commit 1b38d7c851
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/TaskCollection.php
View file

@ -15,11 +15,9 @@
* @since CakePHP(tm) v 2.0 * @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
<<<<<<< HEAD:lib/Cake/Console/TaskCollection.php
App::uses('ObjectCollection', 'Utility'); App::uses('ObjectCollection', 'Utility');
=======
>>>>>>> origin/2.0:cake/console/libs/task_collection.php
class TaskCollection extends ObjectCollection { class TaskCollection extends ObjectCollection {
/** /**
* Shell to use to set params to tasks. * Shell to use to set params to tasks.