Fix: resolve merge conflict

free5gc · Jun 8, 2024 · 5418c70 · 5418c70
1 parent 7621131
commit 5418c70
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/sbi/producer/pdu_session.go b/internal/sbi/producer/pdu_session.go
@@ -67,7 +67,7 @@ func HandlePDUSessionSMContextCreate(isDone <-chan struct{},
 
 	upi := smf_context.GetUserPlaneInformation()
 	upi.Mu.RLock()
-	defer upi.Mu.RUnlock()>>>>>>> main
+	defer upi.Mu.RUnlock()
 
 	// DNN Information from config
 	smContext.DNNInfo = smf_context.RetrieveDnnInformation(smContext.SNssai, smContext.Dnn)