Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
Conflicts: openair2/RRC/NR/MESSAGES/asn1_msg.h
This commit is contained in:
@@ -75,7 +75,6 @@ unsigned short config_frames[4] = {2,9,11,13};
|
||||
#include "common/utils/LOG/vcd_signal_dumper.h"
|
||||
#include "UTIL/OPT/opt.h"
|
||||
#include "enb_config.h"
|
||||
//#include "PHY/TOOLS/time_meas.h"
|
||||
|
||||
|
||||
#include "create_tasks.h"
|
||||
|
||||
Reference in New Issue
Block a user