Merge conflict

project-chip · Jun 16, 2022 · 612f158 · 612f158
1 parent c978c90
commit 612f158
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp
@@ -142,7 +142,7 @@ bool PairingSession::IsSessionEstablishmentInProgress()
     }
 
     Transport::SecureSession * secureSession = mSecureSessionHolder->AsSecureSession();
-    return secureSession->IsPairing();
+    return secureSession->IsEstablishing();
 }
 
 void PairingSession::Clear()