Ignore:
Timestamp:
09/28/12 08:08:47 (12 years ago)
Author:
nanardon
Message:

fix conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/root/html/includes/list_objects.tt

    r1131 r1162  
    3939    </td> 
    4040    <td><a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ ofilter.otype ]), object.id) %]"> 
    41         <img src="[% c.uri_for('/static', 'icons', 'icon_edit.png') %]" 
    42             height="16" width="16" 
     41        <img src="[% c.uri_for('/static', 'images', 'icon_edit.png') %]" 
     42            class="editobj" 
    4343            alt="[% "edit " _ object.id | html %]"></a> 
    4444    [% object.id | html %]</td> 
Note: See TracChangeset for help on using the changeset viewer.