-
Cedric Roux authored
Conflicts: openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c openair2/RRC/LTE/MESSAGES/asn1_msg.c openair2/RRC/LTE/rrc_defs.h
677dc80e
Conflicts: openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c openair2/RRC/LTE/MESSAGES/asn1_msg.c openair2/RRC/LTE/rrc_defs.h