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

Removed merge detritus

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 05:30:25 +00:00
parent 4fd130a5a4
commit 9319f0bf92
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

@@ -908,7 +908,6 @@
</property> </property>
</bean> </bean>
<<<<<<< .working
<bean id="patch.customModels" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" > <bean id="patch.customModels" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
<property name="id"><value>patch.customModels</value></property> <property name="id"><value>patch.customModels</value></property>
<property name="description"><value>patch.customModels.description</value></property> <property name="description"><value>patch.customModels.description</value></property>