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 -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>
Index: openacs-4/packages/lors-central/www/one-resource.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lors-central/www/one-resource.adp,v
diff -u -r1.1.6.2 -r1.1.6.3
--- openacs-4/packages/lors-central/www/one-resource.adp	20 Feb 2007 16:57:50 -0000	1.1.6.2
+++ openacs-4/packages/lors-central/www/one-resource.adp	21 Feb 2007 11:53:04 -0000	1.1.6.3
@@ -6,6 +6,6 @@
 <p><a class="button" href="md/pbs-md/?ims_md_id=@displayed_object_id@">Edit Metadata</a></p>
 <h3>Versions of this learning object</h3>
 <listtemplate name="revisions"></listtemplate>
-<include src="/packages/lors-central/lib/item-files/" res_id="@res_id@">
+<include src="/packages/lors-central/lib/item-files" res_id="@res_id@" ims_item_id="@ims_item_id@">
 <h3>Courses that use this learning object</h3>
 <listtemplate name="courses"></listtemplate>
\ No newline at end of file