From 436b6259c05e2fd56610365ad1470e712126ad7d Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 24 Apr 2013 16:57:46 +0200
Subject: [PATCH] Fix: finish merge

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 4d482f017cf..1df48c997dc 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -96,12 +96,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	/**
 	 * Return the parsed logfile path
 	 *
-<<<<<<< OURS
 	 * @return string
-=======
-	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
-	 * @return	string
->>>>>>> THEIRS
 	 */
 	private function getFilename()
 	{