diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index efa7b753101..c1918ed6247 100644
--- a/htdocs/core/datepicker.php
+++ b/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
\ No newline at end of file