Index: openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	13 Nov 2008 23:50:16 -0000	1.7
+++ openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	13 Nov 2008 23:59:08 -0000	1.8
@@ -5,11 +5,7 @@
     
     @creation-date Nov 2006
     @author jopez@inv.it.uc3m.es
-<<<<<<< imsld-monitor-procs.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.6
 }
 
 namespace eval imsld::monitor {}
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -N -r1.70 -r1.71
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:50:16 -0000	1.70
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:59:08 -0000	1.71
@@ -5,11 +5,7 @@
     
     @creation-date Jul 2005
     @author jopez@inv.it.uc3m.es
-<<<<<<< imsld-parse-procs.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.69
 }
 
 namespace eval imsld {}
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -N -r1.105 -r1.106
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	13 Nov 2008 23:50:16 -0000	1.105
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	13 Nov 2008 23:59:08 -0000	1.106
@@ -5,11 +5,7 @@
     
     @creation-date Aug 2005
     @author jopez@inv.it.uc3m.es
-<<<<<<< imsld-procs.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.104
 }
 
 namespace eval imsld {}
@@ -2628,7 +2624,6 @@
     } else {
         # is webcontent, let's get the associated files
         foreach file_list [db_list_of_lists associated_files { *SQL* }] {
-    ns_log notice "resource_item_id $resource_item_id"
             set imsld_file_id [lindex $file_list 0]
             set file_name [lindex $file_list 1]
             set item_id [lindex $file_list 2]
@@ -2675,32 +2670,16 @@
             }
         }
         # get associated urls
-<<<<<<< imsld-procs.tcl
-	ns_log notice "**************** ids: $resource_id $resource_item_id"
         db_foreach associated_urls_wiki {
             select ar.object_id_two as page_id
             from acs_rels ar,
             imsld_res_files_rels map
             where ar.object_id_one = :resource_item_id
             and ar.rel_id = map.rel_id
 	} {
-=======
-        db_foreach associated_urls_wiki {
-            select ar.object_id_two as page_id
-            from acs_rels ar,
-            imsld_res_files_rels map
-            where ar.object_id_one = :resource_item_id
-            and ar.rel_id = map.rel_id
-	} {
->>>>>>> 1.104
             set a_node [$dom_doc createElement a]
-<<<<<<< imsld-procs.tcl
 	    # set url [imsld::xowiki::page_url -item_id $page_id]
-	    set url "xowiki-view?item_id=$page_id"
-=======
-	    # set url [imsld::xowiki::page_url -item_id $page_id]
 	    set url "xowiki-view/$page_id"
->>>>>>> 1.104
             $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" { {file_url "[export_vars -base $url]"} resource_item_id run_id}]"
 	    ns_log notice "resource item: $resource_item_id"
 	    $a_node setAttribute onclick "return loadContent(this.href)"