mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-04 23:40:04 +00:00
Code Issues Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Carles Fernandez 2024-09-25 20:34:26 +02:00
parent f81bd57961
commit 12a095920f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/system_parameters/galileo_inav_message.h
View File

@ -97,15 +97,14 @@ public:
bool have_new_reduced_ced(); 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 * \brief Returns true if new ISM data have arrived. The flag is set to false when the function is executed
*/ */
bool have_new_ism(); bool have_new_ism();
=======
/*
* \brief Returns true if new NMA data have arrived. The flag is set to false when the function is executed * \brief Returns true if new NMA data have arrived. The flag is set to false when the function is executed
*/ */
bool have_new_nma(); bool have_new_nma();
>>>>>>> d0a6264754a2f7c98fa16bc44321e0b8c62d44db
/* /*
* \brief Returns a Galileo_Ephemeris object filled with the latest navigation data received * \brief Returns a Galileo_Ephemeris object filled with the latest navigation data received