Fix: finish merge

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()
 	{