Fix merge confilict in rotate_signed_prekey_listener.js

7 years ago · 3ac29a4ba3
parent f013eed9d1
commit 3ac29a4ba3
1 changed files with 1 additions and 1 deletions
--- a/js/rotate_signed_prekey_listener.js
+++ b/js/rotate_signed_prekey_listener.js
@ -58,7 +58,7 @@

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