Skip to content

Commit

Permalink
Fix merge conflict in CASESession.cpp (#19466)
Browse files Browse the repository at this point in the history
- Semantic merge conflict between #19277 and #19261
- One line mismatch
  • Loading branch information
tcarmelveilleux authored and pull[bot] committed Jun 30, 2022
1 parent b171fd5 commit 1552313
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/protocols/secure_channel/CASESession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 1552313

Please sign in to comment.