Fix merge confilict in rotate_signed_prekey_listener.js

signalapp · Dec 5, 2017 · 3ac29a4 · 3ac29a4
1 parent f013eed
commit 3ac29a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;