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

Clean some version control comments!

Browse Source
This commit is contained in:
Javier Arribas 2014-09-04 10:54:33 +02:00
parent b2cd611b6e
commit ba1a32f742
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/receiver/control_thread.cc
View File

@ -729,17 +729,6 @@ void ControlThread::gps_iono_data_collector()
} }
} }
<<<<<<< HEAD
void ControlThread::galileo_almanac_data_collector()
{
// ############ 1.bis READ ALMANAC QUEUE ####################
Galileo_Almanac galileo_almanac;
while(stop_ == false)
{
global_galileo_almanac_queue.wait_and_pop(galileo_almanac);
=======
void ControlThread::galileo_almanac_data_collector() void ControlThread::galileo_almanac_data_collector()
{ {
// ############ 1.bis READ ALMANAC QUEUE #################### // ############ 1.bis READ ALMANAC QUEUE ####################
@ -747,7 +736,6 @@ void ControlThread::galileo_almanac_data_collector()
while(stop_ == false) while(stop_ == false)
{ {
global_galileo_almanac_queue.wait_and_pop(galileo_almanac); global_galileo_almanac_queue.wait_and_pop(galileo_almanac);
>>>>>>> refs/remotes/origin/next
LOG(INFO) << "New galileo_almanac record has arrived "; LOG(INFO) << "New galileo_almanac record has arrived ";
// there is no timestamp for the galileo_almanac data, new entries must always be added // there is no timestamp for the galileo_almanac data, new entries must always be added