Skip to content
Snippets Groups Projects
Commit dd3dbb0f authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #2330 from aspangaro/develop-typo 

Fix : Typo on merge
parents 1776349a 71b9098a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/core/datepicker.php
+ 1
− 6
View file @ dd3dbb0f
...@@ -194,10 +194,6 @@ function displayBox($selectedDate,$month,$year) ...@@ -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
...@@ -293,4 +289,3 @@ function displayBox($selectedDate,$month,$year) ...@@ -293,4 +289,3 @@ function displayBox($selectedDate,$month,$year)
</table> </table>
<?php <?php
}//end function }//end function
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment