-
Raymond Knopp authored
Conflicts: cmake_targets/autotests/test_case_list.xml executables/nr-gnb.c openair1/PHY/INIT/nr_init.c openair1/PHY/TOOLS/tools_defs.h openair1/PHY/defs_gNB.h openair1/SCHED_NR/phy_procedures_nr_gNB.c
7caf3d9c
Conflicts: cmake_targets/autotests/test_case_list.xml executables/nr-gnb.c openair1/PHY/INIT/nr_init.c openair1/PHY/TOOLS/tools_defs.h openair1/PHY/defs_gNB.h openair1/SCHED_NR/phy_procedures_nr_gNB.c