From abcae111ff719259f3204cf1d52293d30aff6d5f Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Mon, 12 Nov 2018 10:07:56 +0100 Subject: [PATCH] - fixed spare merge conflict line --- interface/lib/classes/functions.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index a1cda41e86..a86057a064 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -536,7 +536,6 @@ class functions { } } ->>>>>>> ispconfig3.official/master } ?> -- GitLab