From 12a095920f497ed427addc7b68deef69b77ec1ed Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 25 Sep 2024 20:34:26 +0200 Subject: [PATCH] Fix merge conflict --- src/core/system_parameters/galileo_inav_message.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/system_parameters/galileo_inav_message.h b/src/core/system_parameters/galileo_inav_message.h index 47c31aba9..94a994805 100644 --- a/src/core/system_parameters/galileo_inav_message.h +++ b/src/core/system_parameters/galileo_inav_message.h @@ -97,15 +97,14 @@ public: bool have_new_reduced_ced(); /* -<<<<<<< HEAD * \brief Returns true if new ISM data have arrived. The flag is set to false when the function is executed */ bool have_new_ism(); -======= + + /* * \brief Returns true if new NMA data have arrived. The flag is set to false when the function is executed */ bool have_new_nma(); ->>>>>>> d0a6264754a2f7c98fa16bc44321e0b8c62d44db /* * \brief Returns a Galileo_Ephemeris object filled with the latest navigation data received