mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Fix merging conflict
This commit is contained in:
		| @@ -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. | ||||
|      */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez