From 09e2b49b88ecf101dea37bc3c0c92c16e65b59d9 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Mon, 15 Jan 2024 14:45:38 +0100 Subject: [PATCH] Fix resolve conflicts --- htdocs/fourn/commande/dispatch.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index d75594bf0cd..2266b2ef2e2 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -44,7 +44,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; if (isModEnabled('project')) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } -require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; // Load translation files required by the page $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));