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/header.tt

    r1127 r1162  
    4444</div><!-- #header --> 
    4545 
    46 <div style="float: left;" id="sidebar"> 
     46<div id="sidebar"> 
    4747    [% INCLUDE 'includes/sidebar.tt' %] 
    4848    [% tpl = c.namespace _ '/side_menu.tt' %] 
    … …  
    5454</div> 
    5555 
    56 <div id="mainbox" style="float: left;"> 
     56<div id="mainbox"> 
    5757 
Note: See TracChangeset for help on using the changeset viewer.