KEYCLOAK-3961 Fix wrong conflict merge

This commit is contained in:
mhajas 2017-03-20 15:04:32 +01:00
parent b30b96b9a1
commit 8b8b5174eb

View file

@ -196,9 +196,6 @@ TimeSkew:
if (window.location.href.indexOf("8643") > -1) {
url = url.replace("8180", "8543");
url = url.replace("http", "https");
if (window.location.href.indexOf("8543") > -1) {
url = url.replace("8180", "8543");
url = url.replace("http", "https");
}
var req = new XMLHttpRequest();