From 00e8be516a12bbb2fe9fe8cdad9a51286b2c5112 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 16 Aug 2014 01:48:44 +0100
Subject: [PATCH] merge weirdness
---
webclient/login/login-controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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: ""
};