Index: openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	27 Jun 2018 16:38:25 -0000	1.27
+++ openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	27 Jun 2018 16:51:37 -0000	1.28
@@ -280,12 +280,8 @@
     -propstats:required
     {-propstatus true}
   } {
-<<<<<<< 50-protocol-handler-procs.tcl
-    #my log "multiStatusResonse href $href propstats $propstats"
     set encoded_href [string map {& &amp; < &lt; > &gt;} [ns_urlencode -part path {*}[split $href /]]]
-=======
     #:log "multiStatusResonse href $href propstats $propstats"
->>>>>>> 1.24
     append reply \n \
         {<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/" xmlns:g0="DAV:">} \
         "\n<D:href>$encoded_href</D:href>\n"