Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_coding_NB_IoT.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation_NB_IoT.c
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling_NB_IoT.c
	openair1/PHY/LTE_TRANSPORT/npbch_NB_IoT.c
	openair1/PHY/LTE_TRANSPORT/proto.h