forked from MirrorHub/synapse
merge weirdness
This commit is contained in:
parent
fc846aa771
commit
00e8be516a
|
@ -16,7 +16,7 @@ angular.module('LoginController', ['matrixService'])
|
||||||
desired_user_name: "",
|
desired_user_name: "",
|
||||||
user_id: "",
|
user_id: "",
|
||||||
password: "",
|
password: "",
|
||||||
identityServer: "http://localhost:8090",
|
identityServer: "",
|
||||||
pwd1: "",
|
pwd1: "",
|
||||||
pwd2: ""
|
pwd2: ""
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue