From 377120aeadbfb84b8ca046f077f123128c8a89bb Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Tue, 9 Mar 2021 15:48:34 +0100
Subject: [PATCH] fix merge

---
 core/config.class.inc.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index d38b0ce1d..d32c495ba 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1373,9 +1373,7 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-	);
-
-
+	];
 
 	public function IsProperty($sPropCode)
 	{