-
Eurecom authored
Conflicts: openair2/GNB_APP/MACRLC_nr_paramdef.h openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
969a7a08
Conflicts: openair2/GNB_APP/MACRLC_nr_paramdef.h openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c