evolix
/
evoadmin-web
22
0
Fork 1
Code Issues 33 Pull Requests 6 Releases 1 Wiki Activity

fix error while rebasing

This commit is contained in:
Nicolas Roman 2019-04-08 18:17:42 +02:00
parent 4b5e7a0a10
commit a126cf396d
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/webadmin-edit.php
View File

@ -248,21 +248,11 @@ elseif (isset($params[2]) && $params[2] == "add") {
print " </fieldset>";
print "</form>";
<<<<<<< HEAD
<<<<<<< HEAD
}
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 {
$domain = $params[1];