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/ajax/services/mailing/dest_list.tt

    r1136 r1162  
    1515    </td> 
    1616<td> 
    17 [% c.prototype.link_to_remote( '<img src="' _ c.uri_for('/static/icons', 
    18 'user-trash.png') _ '" height="24" width="24" alt="" title="Retirer ' _ disp _ '">', { 
     17[% c.prototype.link_to_remote( 
     18    '<img src="' _ c.uri_for('/static', 'images', 'user-trash.png' ) _ '" 
     19    height="24" width="24" alt="" title="Retirer ' _ disp _ '">', { 
    1920    update => 'destlist', 
    2021    url    => c.uri_for('/ajax', 'services', 'mailing', 'mod_to', { 
Note: See TracChangeset for help on using the changeset viewer.