inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor merge cleanup

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-09-19 19:43:55 +00:00
parent 53a1c35e78
commit d88dc0f100
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
View File

@@ -138,7 +138,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
} }
/** /**
<<<<<<< .working
* *
* @param policyBehaviourFilter component used to enable and disable behaviours * @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 * 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/>. * 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 * Performs a null-safe get of the node
* *
* @param nodeRef the node to retrieve * @param nodeRef the node to retrieve