-
luis_pereira87 authored
# Conflicts: # openair1/SCHED_NR_UE/pucch_uci_ue_nr.c # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2fb26714