# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c

MR !1272 : \[DOC\] NR feature set update  
MR !1244 : \[DOC\] Update SA tutorial  
MR !1269 : \[CI\] dashboard creds and executor change  
MR !1262 : \[CI\] jenkins pipe to write test results to mysql  
MR !1250 : NR_NSA_no_msg3_retransmission  
MR !1264 : NR_UE_IF_FREQ (IF frequency command line option at OAI UE)

This reverts commit aad4e1a0

Merge branch 'bandwidth-testing-abs' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing-abs

Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c

This reverts commit e13ef657

This reverts commit a53b2609

# Conflicts:
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf