From 56cdd754428238252c4c8631f74b31c82dc4ce90 Mon Sep 17 00:00:00 2001 From: Gastd Date: Wed, 23 Aug 2017 01:03:37 -0300 Subject: [PATCH] Fix conflict --- src/core/receiver/gnss_flowgraph.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 26126e55f..4529a1fba 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -745,15 +745,7 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter++) { 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("5X"))); ->>>>>>> Add glonass svn in signals list -======= - *available_gnss_prn_iter), std::string("1G"))); ->>>>>>> fix glonass signal string } } /*