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/search/index.tt

    r1145 r1162  
    2020    </td> 
    2121    <td><a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ filter.otype ]), object.id) %]"> 
    22         <img src="[% c.uri_for('/static', 'icons', 'icon_edit.png') %]" 
     22        <img src="[% c.uri_for('/static', 'images', 'icon_edit.png') %]" 
    2323            height="16" width="16" 
    2424            alt="[% "edit " _ object.id | html %]"></a> 
Note: See TracChangeset for help on using the changeset viewer.