From d88dc0f1009afc8309ab749950e70c225e8e8aac Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 19 Sep 2011 19:43:55 +0000
Subject: [PATCH] Minor merge cleanup

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index eb78c39e33..d553f0c2de 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -138,7 +138,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
     }
 
     /**
-<<<<<<< .working
      * 
      * @param policyBehaviourFilter     component used to enable and disable behaviours
      */
@@ -148,7 +147,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
     }
 
     /**
-=======
      * Set whether <b>cm:auditable</b> timestamps should be propagated to parent nodes
      * where the parent-child relationship has been marked using <b>propagateTimestamps<b/>.
      * 
@@ -161,7 +159,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
     }
 
     /**
->>>>>>> .merge-right.r30520
      * Performs a null-safe get of the node
      * 
      * @param nodeRef the node to retrieve