# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp