minor changes after merge with develop

executables/nr-gnb.c

@@ -88,7 +88,6 @@
 #include <openair1/PHY/NR_TRANSPORT/nr_dlsch.h>
 #include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
 
-#define USE_MSGQ 1
 //#define USRP_DEBUG 1
 // Fix per CC openair rf/if device update
 // extern openair0_device openair0;
@@ -159,7 +158,6 @@ void *L1_rx_thread(void *arg)
   return NULL;
 }
 /* to be added for URLLC, requires MAC scheduling to be split from UL indication 
->>>>>>> origin/develop
 void *L1_tx_thread(void *arg) {
   PHY_VARS_gNB *gNB = (PHY_VARS_gNB*)arg;
 

openair1/SCHED_NR/fapi_nr_l1.c

@@ -38,7 +38,6 @@
 #include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
 
 
-#define USE_MSGQ 1
 
 extern int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req);
 extern int oai_nfapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req);