-
Eurecom authored
Conflicts: executables/nr-uesoftmodem.c executables/nr-uesoftmodem.h executables/softmodem-common.h openair2/LAYER2/NR_MAC_UE/mac_proto.h openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
15c5ea07