From 15523136bc5c26de57cd7820efcfa2ff64d8aff9 Mon Sep 17 00:00:00 2001 From: Tennessee Carmel-Veilleux Date: Fri, 10 Jun 2022 10:50:13 -0400 Subject: [PATCH] Fix merge conflict in CASESession.cpp (#19466) - Semantic merge conflict between #19277 and #19261 - One line mismatch --- src/protocols/secure_channel/CASESession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp index 79c16adf81f762..a3ed29fe54ae83 100644 --- a/src/protocols/secure_channel/CASESession.cpp +++ b/src/protocols/secure_channel/CASESession.cpp @@ -210,7 +210,7 @@ CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, Fabric auto * fabricInfo = fabricTable->FindFabricWithIndex(peerScopedNodeId.GetFabricIndex()); ReturnErrorCodeIf(fabricInfo == nullptr, CHIP_ERROR_INVALID_ARGUMENT); - err = Init(sessionManager, policy, delegate, ScopedNodeId(peerNodeId, fabricIndex)); + err = Init(sessionManager, policy, delegate, peerScopedNodeId); mRole = CryptoContext::SessionRole::kInitiator;