From e497e58ebd1ec7f23efd745aecdf274acc843998 Mon Sep 17 00:00:00 2001 From: NextGestion Date: Tue, 4 May 2021 10:29:31 +0100 Subject: [PATCH] Conflicts --- htdocs/partnership/admin/about.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php index c8a01516ed6..0d3fb11c4e3 100644 --- a/htdocs/partnership/admin/about.php +++ b/htdocs/partnership/admin/about.php @@ -72,8 +72,6 @@ $backtopage = GETPOST('backtopage', 'alpha'); * Actions */ -// None - /* * View