-
Raymond Knopp authored
Conflicts: cmake_targets/phy_simulators openair1/PHY/NR_TRANSPORT/pucch_rx.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
b9b24588
Conflicts: cmake_targets/phy_simulators openair1/PHY/NR_TRANSPORT/pucch_rx.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c