Index: openacs-4/packages/xowiki/resources/templates/view-plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/Attic/view-plain-master.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	31 Jan 2020 17:59:51 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	31 Jan 2020 18:01:10 -0000	1.1.2.4
@@ -1,8 +1,4 @@
-<<<<<<< view-plain-master.adp
-<!-- Generated by ::xowiki::ADP_Generator on Wed Jan 22 14:59:23 CET 2020 -->
-=======
 <!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
->>>>>>> 1.1.2.2
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>