rmagueta 4f29c73bb6 Merge remote-tracking branch 'origin/develop' into develop-CSI ...

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

2022-04-06 10:11:49 +01:00

..

CONF

Merge remote-tracking branch 'origin/develop' into develop-CSI

2022-04-06 10:11:49 +01:00