From bca399623fbe9cb4ce03fbd2c853f762721f53bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 Apr 2013 12:44:36 +0200
Subject: [PATCH] Fix: finish merge
---
htdocs/core/modules/syslog/mod_syslog_file.php | 8 --------
1 file changed, 8 deletions(-)
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index a628ee02d3e..e7e2c01372d 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -96,17 +96,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
/**
* Return the parsed logfile path
*
-<<<<<<< HEAD
* @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string
-=======
-<<<<<<< OURS
* @return string
-=======
- * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
- * @return string
->>>>>>> THEIRS
->>>>>>> refs/remotes/origin/3.3
*/
private function getFilename($suffixinfilename='')
{
--
GitLab