From ed06d00e4a0c5abf03967988cde47950e248b8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Wed, 5 Jan 2011 22:50:33 -0430
Subject: [PATCH] fixing merge error in AclNode class

---
 lib/Cake/Model/AclNode.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php
index aa112d391..cc4895e55 100644
--- a/lib/Cake/Model/AclNode.php
+++ b/lib/Cake/Model/AclNode.php
@@ -183,9 +183,6 @@ class AclNode extends AppModel {
 		}
 		return $result;
 	}
-<<<<<<< HEAD:lib/Cake/Model/AclNode.php
-}
-=======
 }
 
 /**