diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php index 84c6672..6c47a4e 100644 --- a/inc/webadmin-edit.php +++ b/inc/webadmin-edit.php @@ -248,11 +248,15 @@ elseif (isset($params[2]) && $params[2] == "add") { print " "; print ""; +<<<<<<< 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';