-
gauthier authored
Conflicts: openair1/SCHED/phy_procedures_lte_eNb.c targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
fbe1958e
Conflicts: openair1/SCHED/phy_procedures_lte_eNb.c targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf