merge weirdness

1 files changed, 1 insertions, 1 deletions

diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js

index aa928ef48d..67d0b7b90c 100644
--- 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: ""
     };