Fix: Remove obsolete code in legacy service detail page (#11848) (#11880

) * Remove obsolete code in legacy service detail page * restore deleted code * remove obsolete code in legacy service detail page and query sanitizeÃ
centreon · Oct 12, 2022 · 3f43610 · 3f43610
1 parent 5ded6dc
commit 3f43610
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/www/include/monitoring/objectDetails/serviceDetails.php b/www/include/monitoring/objectDetails/serviceDetails.php
@@ -875,10 +875,6 @@
         $tpl->assign("sv_ext_action_url", CentreonUtils::escapeSecure($actionurl));
         $tpl->assign("sv_ext_icon_image_alt", getMyServiceExtendedInfoField($service_id, "esi_icon_image_alt"));
         $tpl->assign("index_data", $index_data);
-<<<<<<< HEAD
-=======
-        $tpl->assign("options2", CentreonUtils::escapeSecure($optionsURL2));
->>>>>>> 7a375650b1 (fix(details): remove dead code (#11672) (#11685))
 
         /**
          * Build the service detail URI that will be used in the