-
luis_pereira87 authored
# Conflicts: # openair1/PHY/TOOLS/lte_ue_scope.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/RRC/NR/rrc_gNB_reconfig.c
a87e99ad
# Conflicts: # openair1/PHY/TOOLS/lte_ue_scope.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/RRC/NR/rrc_gNB_reconfig.c