From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 8 May 2012 16:48:40 +0000 (-0700)
Subject: CSPACE-4813: Finish merging in changes made to master into CSPACE-4813 branch tenant... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=dc77925f8bc270284834be1d3872d544f3a0298c;p=tmp%2Fjakarta-migration.git

CSPACE-4813: Finish merging in changes made to master into CSPACE-4813 branch tenant bindings prototype config.
---

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 58baaf6d8..cc1cf44aa 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -953,7 +953,6 @@
                 <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="loansout_common" updated="" order="1">
                     <service:properties>
                         <!-- Fields containing authority term references -->
-<<<<<<< HEAD
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>authRef</types:key>
                             <types:value>borrower</types:value>
@@ -2968,9 +2967,7 @@
                         <!-- Fields containing authority term references -->
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>authRef</types:key>
-<<<<<<< HEAD
                             <types:value>addressGroupList/*/addressMunicipality</types:value>
-                            =======
                             <types:value>placeOwnerGroupList/*/owner</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
@@ -2996,7 +2993,6 @@
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
                             <types:value>placeNameGroupList/*/nameStatus</types:value>
-                            >>>>>>> upstream/master
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>authRef</types:key>