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/netzones/menu.tt

    r976 r1162  
    44<div id="oinfo"> 
    55    <div id="oinfo_icons"> 
    6     <img src="[% c.uri_for('/static', 'icons', 'preferences-desktop-wallpaper.png') %]" 
     6    <img src="[% c.uri_for('/static', 'images', 'preferences-desktop-wallpaper.png') %]" 
    77    alt="[% "Ordinateur " _ hostgroupname %]"> 
    88    </div> 
     
    1313    </div> 
    1414</div> 
    15 <div id="oinfo_close"></div> 
     15<div  
Note: See TracChangeset for help on using the changeset viewer.