Resolved merge conflicts and allocated gNB struct in VNF

This commit is contained in:
Mahesh
2021-05-25 04:37:23 +05:30
655 changed files with 54522 additions and 19680 deletions
@@ -27,7 +27,6 @@ extern "C" {
#include <openair2/PHY_INTERFACE/IF_Module.h>
#include "nfapi_nr_interface.h"
#include "nfapi_nr_interface_scf.h"
#include <sys/types.h>
#include "openair1/PHY/defs_gNB.h"