-
Raymond Knopp authored
Conflicts: cmake_targets/phy_simulators openair1/PHY/CODING/crc_byte.c openair2/GNB_APP/gnb_paramdef.h openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c openair2/RRC/NR/rrc_gNB.c
da54df5b
Conflicts: cmake_targets/phy_simulators openair1/PHY/CODING/crc_byte.c openair2/GNB_APP/gnb_paramdef.h openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c openair2/RRC/NR/rrc_gNB.c