From 80c329276fd87743ce118e4f8db01c9bcc800806 Mon Sep 17 00:00:00 2001
From: Florian Prill <florian.prill@dwd.de>
Date: Tue, 18 Dec 2018 10:33:22 +0100
Subject: [PATCH] fix for conflict.

---
 src/libmtime_hl.f90 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libmtime_hl.f90 b/src/libmtime_hl.f90
index 8199d97c..440a3cc9 100644
--- a/src/libmtime_hl.f90
+++ b/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
 
-- 
GitLab