Changeset 37

Show
Ignore:
Timestamp:
07/11/05 02:17:05
Author:
sjudge
Message:

small change

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/OATSPSC/skins/plonesoftwarecenter/psc_project_view.pt

    r36 r37  
    4343        <img tal:replace="structure here/recommend_icon.gif" /> 
    4444                This is a recommended project. 
    45 <<<<<<< .mine 
    4645        </span> 
    4746        <span class = "discreet" tal:condition="python:here.getOats_status() == ('OATSProject',)"> 
     
    4948        <img tal:replace="structure here/forge_icon.gif" /> 
    5049                This is an OATS project. 
    51 ======= 
    52 >>>>>>> .r35 
    5350        </span> 
    5451