fix conflict

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h

@@ -150,6 +150,12 @@ public:
      {
          gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
          d_gnss_synchro = p_gnss_synchro;
+         // Dealing with FDMA system
+         if(d_gnss_synchro->System == 'R')
+          {
+            d_freq += 0.5625e6 * GLONASS_PRN[d_gnss_synchro->PRN+1];
+            std::cout << "d_freq " << d_freq << std::endl;
+          }
      }
 
      /*!

src/core/receiver/gnss_flowgraph.cc

@@ -605,6 +605,12 @@ void GNSSFlowgraph::set_signals_list()
     std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
                     11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
 
+    /*
+     * Only 24 operational
+     */
+    std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+                    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
+
     std::string sv_list = configuration_->property("Galileo.prns", std::string("") );
 
     if( sv_list.length() > 0 )

src/core/system_parameters/Glonass_L1_CA.h

@@ -2,10 +2,15 @@
 #define GNSS_SDR_GLONASS_L1_CA_H_
 
 #include <vector>
+<<<<<<< HEAD
 #include <map> // std::map
 #include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 
+=======
+#include <utility> // std::pair
+#include "MATH_CONSTANTS.h"
+>>>>>>> c381e10dc3b71a0a762b27c06ac828557d2ddf4e
 
 // Physical constants
 const double GLONASS_C_m_s       = 299792458.0;      //!< The speed of light, [m/s]