From 3665d0afd9e4a77915e723fb5ec04ceffd6f7a7d Mon Sep 17 00:00:00 2001 From: Haitem Date: Tue, 21 Jul 2020 10:47:32 +0200 Subject: [PATCH] Fix --- app/models/managers/LogMaintainer.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/models/managers/LogMaintainer.php b/app/models/managers/LogMaintainer.php index f2b5941..b852d7c 100644 --- a/app/models/managers/LogMaintainer.php +++ b/app/models/managers/LogMaintainer.php @@ -14,11 +14,7 @@ class LogMaintainer unlink ($dir . $file); } } else { -<<<<<<< HEAD $this->cleaningDir ($dir . $file . "/", $seconds); -======= - $this->cleaningDir ($path . $file . "/", $seconds); ->>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494 } } } @@ -27,8 +23,4 @@ class LogMaintainer $seconds = $days * 86400; $this->cleaningDir ('../logs/', $seconds); } -<<<<<<< HEAD } -======= -} ->>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494