-
rmagueta authored
# Conflicts: # openair1/SIMULATION/NR_PHY/dlsim.c # openair1/SIMULATION/NR_PHY/ulsim.c # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/rrc_gNB_nsa.c # openair2/RRC/NR/rrc_gNB_reconfig.c
4f58d669
# Conflicts: # openair1/SIMULATION/NR_PHY/dlsim.c # openair1/SIMULATION/NR_PHY/ulsim.c # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/rrc_gNB_nsa.c # openair2/RRC/NR/rrc_gNB_reconfig.c