[PATCH 001/007] Missed a conflict in the last pull.

--- src/libdivecomputer.symbols | 3 --- 1 file changed, 3 deletions(-)

diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index fd8f44a..a870a22 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -170,8 +170,5 @@ shearwater_predator_extract_dives shearwater_petrel_device_open diverite_nitekq_device_open diverite_nitekq_extract_dives -<<<<<<< HEAD cochran_commander_device_open -======= citizen_aqualand_device_open ->>>>>>> 134da18190b5ea1581d789564979e3e4c73cd243