From ae36f52b660d3544b7b98de7a1753749d3c4ec40 Mon Sep 17 00:00:00 2001
From: Robert Smallwood <robert.smallwood@readytalk.com>
Date: Wed, 9 Dec 2015 12:44:08 -0700
Subject: [PATCH] Fixing missed merge conflict

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 3403cd8c3..889096d2e 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ function init() {
 
     APP.desktopsharing.init();
     APP.RTC.start();
-    APP.xmpp.start(APP.settings.getJid(), null);
+    APP.xmpp.start();
     APP.statistics.start();
     APP.connectionquality.init();
     APP.keyboardshortcut.init();