Skip to content
Snippets Groups Projects
Commit 1cc09da8 authored by Xue Song's avatar Xue Song
Browse files

Merge branch 'develop_SA_L3' into develop_SA_F1 

Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
parents cb0d7c3d c6cd8f37
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 750 additions and 70 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment