Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix : Typo on merge

Browse Source
This commit is contained in:
aspangaro 2015-02-07 06:42:36 +01:00
parent 3bdf8864a9
commit 71b9098a44
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/datepicker.php
View File

@ -194,10 +194,6 @@ function displayBox($selectedDate,$month,$year)
echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
}
?>
<<<<<<< HEAD
=======
>>>>>>> refs/remotes/origin/3.7
</tr>
<?php
//print "x ".$thedate." y"; // $thedate = first day of month
@ -292,5 +288,4 @@ function displayBox($selectedDate,$month,$year)
</tr>
</table>
<?php
}//end function
}//end function