Index: openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.1.4.2 -r1.1.4.3
--- openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml	20 Feb 2007 16:57:49 -0000	1.1.4.2
+++ openacs-4/packages/assessment-portlet/catalog/assessment-portlet.en_US.ISO-8859-1.xml	21 Feb 2007 11:53:04 -0000	1.1.4.3
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<<<<<<< assessment-portlet.en_US.ISO-8859-1.xml
 <message_catalog package_key="assessment-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1">
-=======
-<message_catalog package_key="assessment-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1">
 
->>>>>>> 1.1.4.1
   <msg key="assessment_admin">assessment admin</msg>
   <msg key="error_one_assessment">There should be only one instance of assessment for admin purpose</msg>
   <msg key="goto_assessment_admin">Go to assessments administration</msg>