From 9319f0bf92550c4c0cdf28c0cbdcc12fe6f56d14 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 11 Sep 2007 05:30:25 +0000
Subject: [PATCH] Removed merge detritus

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/patch/patch-services-context.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 9e730ad8fe..d00b1b5825 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -908,7 +908,6 @@
         </property>
     </bean>
 
-<<<<<<< .working
     <bean id="patch.customModels" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.customModels</value></property>
         <property name="description"><value>patch.customModels.description</value></property>