mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix merge confilict in rotate_signed_prekey_listener.js

Browse source
This commit is contained in:
Scott Nonnenberg 2017-12-04 16:49:43 -08:00
parent f013eed9d1
commit 3ac29a4ba3
No known key found for this signature in database
GPG key ID: A4931C09644C654B
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/rotate_signed_prekey_listener.js
View file

@ -58,7 +58,7 @@
var initComplete; var initComplete;
Whisper.RotateSignedPreKeyListener = { Whisper.RotateSignedPreKeyListener = {
init: function(events) { init: function(events, newVersion) {
if (initComplete) { if (initComplete) {
console.log('Rotate signed prekey listener: Already initialized'); console.log('Rotate signed prekey listener: Already initialized');
return; return;