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

fix another conflict

Browse Source
This commit is contained in:
Gastd 2017-06-05 20:29:33 -03:00
parent bbbb5bcc1d
commit 65e7384c28
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/system_parameters/Glonass_L1_CA.h
View File

@ -2,16 +2,10 @@
#define GNSS_SDR_GLONASS_L1_CA_H_ #define GNSS_SDR_GLONASS_L1_CA_H_
#include <vector> #include <vector>
<<<<<<< HEAD
#include <map> // std::map #include <map> // std::map
#include "MATH_CONSTANTS.h" #include "MATH_CONSTANTS.h"
#include "gnss_frequencies.h" #include "gnss_frequencies.h"
=======
#include <utility> // std::pair
#include "MATH_CONSTANTS.h"
>>>>>>> c381e10dc3b71a0a762b27c06ac828557d2ddf4e
// 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]