merge conflicts resolved

2b62a792 · Raju · p.shashikala · 5823e184 · 2b62a792
Commit 2b62a792 authored Oct 22, 2020 by Raju Committed by p.shashikala Jan 07, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c +5 -5

No files found.
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -950,11 +950,11 @@ void nr_generate_Msg2(module_id_t module_idP,
    nr_configure_dci(nr_mac,
                     pdcch_pdu_rel15,
                     RA_rnti,
-    	             ss,
+    	               ss,
-	             coreset,
+	                   coreset,
-	             scc,
+	                   scc,
-	  	     bwp,
+	  	               bwp,
-		     ra->beam_id,
+		                 ra->beam_id,
                     aggregation_level,
                     CCEIndex);