fixing merge error in AclNode class

cakephp · Jan 6, 2011 · ed06d00 · ed06d00
1 parent 296b8dd
commit ed06d00
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php
@@ -183,9 +183,6 @@ public function node($ref = null) {
 		}
 		return $result;
 	}
-<<<<<<< HEAD:lib/Cake/Model/AclNode.php
-}
-=======
 }
 
 /**