From 8ddbe50d2921595e20947a1c8c828a286117c543 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 14 Oct 2018 15:38:32 +0200 Subject: Cleanup: remove rebasing artefacts Embarrassingly, the header-comment in divelist.c contained a rebasing artefact. Signed-off-by: Berthold Stoeger --- core/divelist.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/divelist.c b/core/divelist.c index ad851ecc8..a903c06f6 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -40,11 +40,8 @@ * bool dive_less_than(const struct dive *a, const struct dive *b) * void sort_table(struct dive_table *table) * bool is_trip_before_after(const struct dive *dive, bool before) -<<<<<<< HEAD * void delete_dive_from_table(struct dive_table *table, int idx) -======= * int find_next_visible_dive(timestamp_t when); ->>>>>>> Undo: select dives after add, remove, merge, split dive commands */ #include #include -- cgit v1.2.3-70-g09d2