-
Xenofon Foukas authored
Conflicts: cmake_targets/tools/build_helper openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/eNB_scheduler.c
93b9b735
Conflicts: cmake_targets/tools/build_helper openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/eNB_scheduler.c