-
wujing authored
Conflicts: openair2/RRC/NR/nr_rrc_proto.h openair2/RRC/NR/rrc_gNB.c openair2/RRC/NR_UE/rrc_UE.c openair2/RRC/NR_UE/rrc_defs.h openair3/NGAP/ngap_gNB_nas_procedures.c
458d3829
Conflicts: openair2/RRC/NR/nr_rrc_proto.h openair2/RRC/NR/rrc_gNB.c openair2/RRC/NR_UE/rrc_UE.c openair2/RRC/NR_UE/rrc_defs.h openair3/NGAP/ngap_gNB_nas_procedures.c