diff options
Diffstat (limited to 'core/divelist.c')
| -rw-r--r-- | core/divelist.c | 3 |
1 files changed, 0 insertions, 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 <unistd.h> #include <stdio.h> |