Diff for /ECHO_content/Attic/ECHO_content_standard.zpt between versions 1.1 and 1.2

version 1.1, 2003/11/25 11:19:47 version 1.2, 2003/12/09 11:20:31
Line 23 Line 23
 </tr>  </tr>
       <tr><td>&nbsp;</td><td>        <tr><td>&nbsp;</td><td>
     <p class="pindent">      <p class="pindent">
 <<<<<<< ECHO_content_standard.zpt  
       <span tal:replace="structure item/description">DESCRIPTION</span></p>        <span tal:replace="structure item/description">DESCRIPTION</span></p>
         <p class="partner"><i><b>Provided by:</b></i>          <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>      <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>        </div>
 </table>  </table>
      </div>       </div>

Removed from v.1.1  
changed lines
  Added in v.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>