Merge pull request #3960 from mhajas/KEYCLOAK-3961

KEYCLOAK-3961 Fix wrong conflict merge
This commit is contained in:
Pavel Drozd 2017-03-27 09:37:18 +02:00 committed by GitHub
commit 4b813ea1d1

View file

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