merge weirdness

This commit is contained in:
Matthew Hodgson 2014-08-16 01:48:44 +01:00
parent fc846aa771
commit 00e8be516a

View file

@ -16,7 +16,7 @@ angular.module('LoginController', ['matrixService'])
desired_user_name: "",
user_id: "",
password: "",
identityServer: "http://localhost:8090",
identityServer: "",
pwd1: "",
pwd2: ""
};