a unnotified conflict resolved

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -85,8 +85,7 @@ void config_common(int Mod_idP,
                    uint64_t ssb_pattern,
 		   uint16_t ssb_periodicity,
 		   uint64_t dl_CarrierFreqP,
-                   uint32_t dl_BandwidthP
-                  ){
+                   uint32_t dl_BandwidthP){
 
   nfapi_nr_config_request_t *cfg = &RC.nrmac[Mod_idP]->config[CC_idP];
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -38,9 +38,10 @@ void mac_top_init_gNB(void);
 
 void config_common(int Mod_idP,
                    int CC_idP,
-				   int Nid_cell,
+		   int Nid_cell,
                    int nr_bandP,
-				   uint64_t ssb_pattern,
+		   uint64_t ssb_pattern,
+		   uint16_t ssb_periodicity,
                    uint64_t dl_CarrierFreqP,
                    uint32_t dl_BandwidthP);