fix rebase
This commit is contained in:
parent
cb595177a9
commit
0afcb60e7d
|
@ -88,7 +88,7 @@ internal data class KeyVerificationAccept(
|
|||
hash: String,
|
||||
commitment: String,
|
||||
messageAuthenticationCode: String,
|
||||
shortAuthenticationStrings: List<String>): VerifInfoAccept {
|
||||
shortAuthenticationStrings: List<String>): VerificationInfoAccept {
|
||||
return KeyVerificationAccept().apply {
|
||||
this.transactionID = tid
|
||||
this.keyAgreementProtocol = keyAgreementProtocol
|
||||
|
|
Loading…
Reference in New Issue