Merge conflicts resolved
Showing
- openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c 2 additions, 2 deletionsopenair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
- openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c 6 additions, 3 deletionsopenair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c 3 additions, 2 deletionsopenair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
Loading
Please register or sign in to comment