From ca057abf2d05090157a032270663cdc7b6e50208 Mon Sep 17 00:00:00 2001 From: Gastd Date: Mon, 5 Jun 2017 20:29:33 -0300 Subject: [PATCH] fix another conflict --- src/core/system_parameters/Glonass_L1_CA.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/system_parameters/Glonass_L1_CA.h b/src/core/system_parameters/Glonass_L1_CA.h index 5661c2a52..bd529b34e 100644 --- a/src/core/system_parameters/Glonass_L1_CA.h +++ b/src/core/system_parameters/Glonass_L1_CA.h @@ -6,7 +6,6 @@ #include "MATH_CONSTANTS.h" #include "gnss_frequencies.h" - // Physical constants 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]