From 18c7bc904778f79563b6736468a145b8985a5e22 Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Tue, 28 Nov 2017 18:30:18 +0100
Subject: [PATCH] Further fix for merge fail.

---
 src/libmtime.f90 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libmtime.f90 b/src/libmtime.f90
index eeeea119..04d02826 100644
--- a/src/libmtime.f90
+++ b/src/libmtime.f90
@@ -145,7 +145,8 @@ end module mtime_calendar
 
 MODULE mtime_juliandelta
   !
-  USE, INTRINSIC :: iso_c_binding, ONLY: c_int64_t, c_char, c_ptr, c_loc, c_associated
+  USE, INTRINSIC :: iso_c_binding, ONLY: c_int64_t, c_char, c_ptr, c_loc, &
+       c_associated, c_f_pointer
   !
   IMPLICIT NONE
   !
-- 
GitLab