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

Fixed merge error

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-03-22 18:19:35 +00:00
parent d4d33c1e34
commit 75ce410028
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/patch/patch-services-context.xml
View File

@@ -362,5 +362,4 @@
<!-- Note: targetSchema 11 is allocated for patching in an enterprise trial license --> <!-- Note: targetSchema 11 is allocated for patching in an enterprise trial license -->
<!-- A patch bean is not provided as this is handled by the license component internally (enterprise only) --> <!-- A patch bean is not provided as this is handled by the license component internally (enterprise only) -->
>>>>>>> .merge-right.r2569
</beans> </beans>