Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.70 -r1.71
--- openacs-4/packages/contacts/contacts.info	1 Apr 2006 07:04:19 -0000	1.70
+++ openacs-4/packages/contacts/contacts.info	1 Apr 2006 07:13:26 -0000	1.71
@@ -10,11 +10,7 @@
     <version name="1.2b9" url="http://openacs.org/repository/download/apm/contacts-1.2b9.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
-<<<<<<< contacts.info
         <release-date>2006-03-31</release-date>
-=======
-        <release-date>2006-03-29</release-date>
->>>>>>> 1.69
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>