-
https://gitlab.eurecom.fr/oai/openairinterface5gRaymond Knopp authored
Conflicts: openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2c844312
Conflicts: openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/eNB_scheduler_primitives.c