fix for conflict.

src/libmtime_hl.f90

@@ -16,13 +16,10 @@ module mtime_hl
   
   private
 
-<<<<<<< Updated upstream
   PUBLIC :: t_datetime, t_timedelta
   PUBLIC :: t_timedeltaFromMilliseconds
-=======
-  public :: t_datetime, t_timedelta
-  public :: min, max
->>>>>>> Stashed changes
+  PUBLIC :: min, max
+
 
   integer, parameter :: i8 = selected_int_kind(14)   !< at least 8 byte integer