lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: finish merge

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-24 12:44:36 +02:00
parent f7aa90b3b3
commit bca399623f
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/syslog/mod_syslog_file.php
View File

@ -96,17 +96,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
/** /**
* Return the parsed logfile path * Return the parsed logfile path
* *
<<<<<<< HEAD
* @param string $suffixinfilename When output is a file, append this suffix into default log filename. * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string * @return string
=======
<<<<<<< OURS
* @return string * @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='') private function getFilename($suffixinfilename='')
{ {