aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-10-31 20:32:39 +0000
committerMario <mario@mariovavti.com>2020-10-31 20:32:39 +0000
commit50ca95735deaa402181c387ab6f3919750249f64 (patch)
tree084c9ca096dc87e47e8b4d2df44aa801343ffcba
parentb55c7f794b06d45f3b9cdb2f8a4ce7d99aaf8902 (diff)
downloadvolse-hubzilla-50ca95735deaa402181c387ab6f3919750249f64.tar.gz
volse-hubzilla-50ca95735deaa402181c387ab6f3919750249f64.tar.bz2
volse-hubzilla-50ca95735deaa402181c387ab6f3919750249f64.zip
fix merge conflict
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index b3ed2eb31..a300ccf58 100644
--- a/include/text.php
+++ b/include/text.php
@@ -743,7 +743,7 @@ function logid() {
* @param int $level A log level
* @param int $priority - compatible with syslog
*/
-function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO, $syslog = false) {
+function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
if(! defined('BTLOGGER_DEBUG_FILE'))
define('BTLOGGER_DEBUG_FILE','btlogger.out');