mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Gastd 2017-06-07 17:35:26 -03:00
commit 0fafa4027f
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/receiver/gnss_flowgraph.cc
View File

@ -750,15 +750,7 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"), available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"),
<<<<<<< 3c93101c23e7e730777f47eeff6e7d538c9528e4
<<<<<<< aadcdb80509f7a96b0558b8d33ecaed526bceae9
*available_gnss_prn_iter), std::string("1G"))); *available_gnss_prn_iter), std::string("1G")));
=======
*available_gnss_prn_iter), std::string("5X")));
>>>>>>> Add glonass svn in signals list
=======
*available_gnss_prn_iter), std::string("1G")));
>>>>>>> fix glonass signal string
} }
} }
/* /*