fix merge conflicts

2016-12-22 16:53:03 +01:00
parent 3197b62fbb 29d406b7a9
commit acfc27f5c5
5 changed files with 92 additions and 134 deletions
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -220,7 +220,6 @@ define([
            $logoutBox.slideDown();
        } else {
            revealLogin();
-            //$logoutBox.hide();
        }

        $login.click(function () {