Skip to content
Snippets Groups Projects
Commit 80c32927 authored by Florian Prill's avatar Florian Prill
Browse files

fix for conflict.

parent f720f80c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 5 deletions
src/libmtime_hl.f90
+ 2
− 5
View file @ 80c32927
...@@ -16,13 +16,10 @@ module mtime_hl ...@@ -16,13 +16,10 @@ module mtime_hl
private private
<<<<<<< Updated upstream
PUBLIC :: t_datetime, t_timedelta PUBLIC :: t_datetime, t_timedelta
PUBLIC :: t_timedeltaFromMilliseconds PUBLIC :: t_timedeltaFromMilliseconds
======= PUBLIC :: min, max
public :: t_datetime, t_timedelta
public :: min, max
>>>>>>> Stashed changes
integer, parameter :: i8 = selected_int_kind(14) !< at least 8 byte integer integer, parameter :: i8 = selected_int_kind(14) !< at least 8 byte integer
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint | Privacy Policy