1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-20 00:34:57 +00:00

fix another conflict

This commit is contained in:
Gastd 2017-06-05 20:29:33 -03:00
parent 2091ac354a
commit ca057abf2d

View File

@ -6,7 +6,6 @@
#include "MATH_CONSTANTS.h" #include "MATH_CONSTANTS.h"
#include "gnss_frequencies.h" #include "gnss_frequencies.h"
// Physical constants // Physical constants
const double GLONASS_C_m_s = 299792458.0; //!< The speed of light, [m/s] const double GLONASS_C_m_s = 299792458.0; //!< The speed of light, [m/s]
const double GLONASS_C_m_ms = 299792.4580; //!< The speed of light, [m/ms] const double GLONASS_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]