diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-14 15:38:32 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-14 15:55:07 -0400 |
| commit | 8ddbe50d2921595e20947a1c8c828a286117c543 (patch) | |
| tree | 9d6f9b7d66e187b9c728e70067b680e22483c911 /core | |
| parent | 0f9edf06e2fb90e6fe99995c566f7fdc40281d29 (diff) | |
| download | subsurface-8ddbe50d2921595e20947a1c8c828a286117c543.tar.gz | |
Cleanup: remove rebasing artefacts
Embarrassingly, the header-comment in divelist.c contained a rebasing
artefact.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -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> |