--- ECHO_content/Attic/ECHO_content_standard.zpt	2003/11/25 11:19:47	1.1
+++ ECHO_content/Attic/ECHO_content_standard.zpt	2003/12/09 11:20:31	1.2
@@ -23,16 +23,12 @@
 </tr>
       <tr><td>&nbsp;</td><td>
 	<p class="pindent">
-<<<<<<< ECHO_content_standard.zpt
+
       <span tal:replace="structure item/description">DESCRIPTION</span></p>
         <p class="partner"><i><b>Provided by:</b></i>
 	<p class="partner" tal:repeat="credit item/credits" tal:content="python:here.getCreditObject(credit).title"/></td></tr>
 	
-=======
-       <span tal:replace="structure item/description">DESCRIPTION</span></p>
-	<p class="partner" tal:repeat="credit item/credits" tal:content="python:here.getCreditObject(credit).title"/>
-	
->>>>>>> 1.8
+
       </div>
 </table>
      </div>