From 75ce4100288daa290457b7bb9840a9d1ca011d6e Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 22 Mar 2006 18:19:35 +0000
Subject: [PATCH] Fixed merge error

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2572 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 6758481f2c..5daa5feec0 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -362,5 +362,4 @@
     <!-- 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) -->
     
->>>>>>> .merge-right.r2569
 </beans>