From 15840f6ae5b6bd1f1ad98d1014a7582751d1e097 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 26 Oct 2023 14:45:01 +0200 Subject: [PATCH] Fix merging --- .../gnuradio_blocks/galileo_telemetry_decoder_gs.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 9467f3994..1f7678ced 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -105,13 +105,9 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs( d_enable_reed_solomon_inav(false), d_valid_timetag(false), d_E6_TOW_set(false), -<<<<<<< HEAD d_there_are_e1_channels(conf.there_are_e1_channels), - d_there_are_e6_channels(conf.there_are_e6_channels) -======= d_there_are_e6_channels(conf.there_are_e6_channels), d_use_ced(conf.use_ced) ->>>>>>> 62a8547e62605a6b9fa6b1e128beceb046bde2dc { // prevent telemetry symbols accumulation in output buffers this->set_max_noutput_items(1);