From 4b5e7a0a1090dd88ec6d79d83d0a1896c6d84027 Mon Sep 17 00:00:00 2001
From: Nicolas Roman <nroman@evolix.fr>
Date: Tue, 2 Apr 2019 11:37:04 +0200
Subject: [PATCH] added select element to link a new alias to a domain

---
 inc/webadmin-edit.php | 4 ++++
 1 file changed, 4 insertions(+)

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 "     </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';