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

fixing merge error in AclNode class

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2011-01-05 22:50:33 -04:30
parent 296b8dd77b
commit ed06d00e4a
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Model/AclNode.php
View file

@ -183,9 +183,6 @@ class AclNode extends AppModel {
}
return $result;
}
<<<<<<< HEAD:lib/Cake/Model/AclNode.php
}
=======
}
/**