From a126cf396df953f1759f6da9c0e78afd04a3ce8c Mon Sep 17 00:00:00 2001
From: Nicolas Roman <nroman@evolix.fr>
Date: Mon, 8 Apr 2019 18:17:42 +0200
Subject: [PATCH] fix error while rebasing

---
 inc/webadmin-edit.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php
index 6c47a4e..49551ca 100644
--- a/inc/webadmin-edit.php
+++ b/inc/webadmin-edit.php
@@ -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];