Dotclear


Ignore:
Timestamp:
05/04/11 23:58:52 (13 years ago)
Author:
xave <xave@…>
Branch:
userprefs
Message:

I need to learn mercurial.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • admin/index.php

    r152 r153  
    272272 
    273273# Dashboard icons 
    274 <<<<<<< local 
    275274echo '<div id="dashboard-main"'.($dashboardItems ? '' : ' class="fullwidth"').'><div id="icons">'; 
    276 ======= 
    277 echo '<div id="dashboard-main"><div id="icons"'.($dashboardItems ? '' : 'class="fullwidth"').'>'; 
    278 >>>>>>> other 
    279275foreach ($__dashboard_icons as $i) 
    280276{ 
Note: See TracChangeset for help on using the changeset viewer.

Sites map