From 8f0c6f0e833c28635fa4ada464bcf5d06c0de916 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 24 Mar 2020 12:13:13 -0500 Subject: Remove VCS merge conflict --- src/H5trace.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/H5trace.c b/src/H5trace.c index 0d48708..26a59c7 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -155,13 +155,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end if */ /* Get time for event */ -<<<<<<< HEAD if(H5_DBL_ABS_EQUAL(first_time.etime, H5_DOUBLE(0.0))) -||||||| parent of 04b8cc82a8... Add routines to query the library's free list sizes and allocation stats. - if(H5_DBL_ABS_EQUAL(first_time.etime, 0.0)) -======= - if(H5_DBL_ABS_EQUAL(first_time.etime, (double)0.0f)) ->>>>>>> 04b8cc82a8... Add routines to query the library's free list sizes and allocation stats. H5_timer_begin(&first_time); if(H5_debug_g.ttimes) H5_timer_begin(&event_time); -- cgit v0.12