-
rmagueta authored
# Conflicts: # openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c # openair1/SCHED_NR_UE/fapi_nr_ue_l1.c # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
a634f14f
# Conflicts: # openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c # openair1/SCHED_NR_UE/fapi_nr_ue_l1.c # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c