Merge conflicts resolved

2021-02-08 18:05:29 +05:30
parent a169d46415 403db5f66e
commit 0e6f1e6ad6
133 changed files with 11914 additions and 6808 deletions
@@ -775,7 +775,6 @@ void UL_indication(UL_IND_t *UL_info, L1_rxtx_proc_t *proc) {
  }
 }

-
 IF_Module_t *IF_Module_init(int Mod_id) {
  AssertFatal(Mod_id<MAX_MODULES,"Asking for Module %d > %d\n",Mod_id,MAX_IF_MODULES);
  LOG_D(PHY,"Installing callbacks for IF_Module - UL_indication\n");
@@ -1072,7 +1072,6 @@ void handle_nfapi_hi_dci0_hi_pdu(
    nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu) {
 }

-
 void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,
                             int frame,
                             int subframe,
@@ -1131,4 +1130,3 @@ int l1_north_init_eNB(void) {

 void init_eNB_afterRU(void) {
 }
-