TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 17:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: more merge conflict compile issues

Browse Source
This commit is contained in:
0x330a
2023-07-19 00:02:43 +10:00
parent 07e1d80654
commit 74ee433eec
10 changed files with 383 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsignal/protobuf/SignalService.proto
View File

@@ -57,9 +57,9 @@ message Content {
optional UnsendRequest unsendRequest = 9;
optional MessageRequestResponse messageRequestResponse = 10;
optional SharedConfigMessage sharedConfigMessage = 11;
optional ExpirationType expirationType = 11;
optional uint32 expirationTimer = 12;
optional uint64 lastDisappearingMessageChangeTimestamp = 13;
optional ExpirationType expirationType = 12;
optional uint32 expirationTimer = 13;
optional uint64 lastDisappearingMessageChangeTimestamp = 14;
}
message KeyPair {