Merge pull request #2330 from aspangaro/develop-typo

Fix : Typo on merge

htdocs/core/datepicker.php

@@ -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