-
rmagueta authored
# Conflicts: # openair1/PHY/INIT/nr_init_ue.c # openair2/GNB_APP/gnb_config.c # openair2/GNB_APP/gnb_paramdef.h # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/rrc_gNB_reconfig.c
2deec7fa
# Conflicts: # openair1/PHY/INIT/nr_init_ue.c # openair2/GNB_APP/gnb_config.c # openair2/GNB_APP/gnb_paramdef.h # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/rrc_gNB_reconfig.c