mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-04 23:40:04 +00:00
Fix merging conflict
This commit is contained in:
parent
12a095920f
commit
f91f37261d
@ -131,6 +131,11 @@ public:
|
||||
*/
|
||||
Galileo_Ephemeris get_reduced_ced() const;
|
||||
|
||||
/*
|
||||
* \brief Returns a Galileo_ISMs object filled with the latest ISM data received
|
||||
*/
|
||||
Galileo_ISM get_galileo_ism() const;
|
||||
|
||||
/*
|
||||
* \brief Returns an OSNMA_msg object filled with the latest NMA message received. Resets msg buffer.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user