lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2330 from aspangaro/develop-typo

Browse Source 
Fix : Typo on merge
This commit is contained in:
Laurent Destailleur 2015-02-08 00:01:14 +01:00
commit dd3dbb0f76
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"; 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> </tr>
<?php <?php
//print "x ".$thedate." y"; // $thedate = first day of month //print "x ".$thedate." y"; // $thedate = first day of month
@ -292,5 +288,4 @@ function displayBox($selectedDate,$month,$year)
</tr> </tr>
</table> </table>
<?php <?php
}//end function }//end function