mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove rebasing artefacts

Browse source 
Embarrassingly, the header-comment in divelist.c contained a rebasing
artefact.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-14 15:38:32 +02:00 • committed by Dirk Hohndel
parent 0f9edf06e2
commit 8ddbe50d29
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/divelist.c
View file

@ -40,11 +40,8 @@
* bool dive_less_than(const struct dive *a, const struct dive *b) * bool dive_less_than(const struct dive *a, const struct dive *b)
* void sort_table(struct dive_table *table) * void sort_table(struct dive_table *table)
* bool is_trip_before_after(const struct dive *dive, bool before) * bool is_trip_before_after(const struct dive *dive, bool before)
<<<<<<< HEAD
* void delete_dive_from_table(struct dive_table *table, int idx) * void delete_dive_from_table(struct dive_table *table, int idx)
=======
* int find_next_visible_dive(timestamp_t when); * int find_next_visible_dive(timestamp_t when);
>>>>>>> Undo: select dives after add, remove, merge, split dive commands
*/ */
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>