fix error while rebasing
This commit is contained in:
parent
4b5e7a0a10
commit
a126cf396d
|
@ -248,21 +248,11 @@ elseif (isset($params[2]) && $params[2] == "add") {
|
||||||
print " </fieldset>";
|
print " </fieldset>";
|
||||||
print "</form>";
|
print "</form>";
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<<<<<<< HEAD
|
|
||||||
}
|
}
|
||||||
|
|
||||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
}
|
|
||||||
>>>>>>> added select element to link a new alias to a domain
|
|
||||||
|
|
||||||
=======
|
|
||||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
>>>>>>> alias url changed
|
|
||||||
else {
|
else {
|
||||||
|
|
||||||
$domain = $params[1];
|
$domain = $params[1];
|
||||||
|
|
Loading…
Reference in a new issue