merge weirdness

2014-08-16 01:48:44 +01:00 · 2014-08-16 01:48:44 +01:00 · 00e8be516a
parent fc846aa771
commit 00e8be516a
1 changed files with 1 additions and 1 deletions
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@ -16,7 +16,7 @@ angular.module('LoginController', ['matrixService'])
        desired_user_name: "",
        user_id: "",
        password: "",
-        identityServer: "http://localhost:8090",
+        identityServer: "",
        pwd1: "",
        pwd2: ""
    };