Merge pull request #142 from lorenzhs/merge

Fix botched merge
2014-02-14 11:41:55 -05:00 · 2014-02-14 11:41:55 -05:00 · 6fb1aa8e5c
commit 6fb1aa8e5c
parent d26120953f f018876987
2 changed files with 1 additions and 5 deletions
--- a/index.html
+++ b/index.html
@ -61,9 +61,6 @@
                      <input type="text" class="form-control monospace" id="port" ng-model="port" placeholder="9001">
                    </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">