From df28fc00183d381c76c449c023b4575cd8ccb457 Mon Sep 17 00:00:00 2001
From: mariano <mariano@localhost.local>
Date: Wed, 20 May 2026 13:48:33 +0200
Subject: [PATCH] sistemazione erore pag server.form.php

---
 front/server.form.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/front/server.form.php b/front/server.form.php
index b7bc5e8..ef97b14 100644
--- a/front/server.form.php
+++ b/front/server.form.php
@@ -27,11 +27,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             ServerAsset::connectAssetToServer($itemtype, $items_id, $server_id);
         }
 
-<<<<<<< HEAD
         Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.form.php?id=' . $server_id);
-=======
-        Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.php?id=' . $server_id);
->>>>>>> collegamento_e_verifica_host
     }
 
     $id = $_POST['id'] ?? 0;