From f018876987f9ee2b53a2992ef4e791e80fe79aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Fri, 14 Feb 2014 16:40:44 +0000
Subject: [PATCH] Fix botched merge

---
 index.html        | 3 ---
 js/glowingbear.js | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 713bef9..50374c3 100644
--- a/index.html
+++ b/index.html
@@ -66,9 +66,6 @@
                       Error: wrong password
                     </div>
 
-                    <label class="control-label" for="password">WeeChat relay password</label>
-                    <input type="password" class="form-control monospace" id="password" ng-model="password" placeholder="Password">
-
                     <div class="checkbox">
                       <label class="control-label" for="savepassword">
                           <input type="checkbox" id="savepassword" ng-model="savepassword">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 3830a4a..de38017 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -361,8 +361,7 @@ function($rootScope,
     };
 
     var disconnect = function() {
-        /* TODO: Send protocol disconnect */
-        ngWebsockets.disconnect();
+        ngWebsockets.send(weeChat.Protocol.formatQuit());
     };
 
     /*