merge fix

2020-07-21 10:46:27 +02:00
parent 67cc103db5 1a448663f0
commit 5ba86edb69
4 changed files with 17 additions and 26 deletions
--- a/app/models/managers/LogMaintainer.php
+++ b/app/models/managers/LogMaintainer.php
@@ -14,7 +14,11 @@ class LogMaintainer
 					unlink ($dir . $file);
 				}
 			} else {
+<<<<<<< HEAD
 				$this->cleaningDir ($dir . $file . "/", $seconds);
+=======
+				$this->cleaningDir ($path . $file . "/", $seconds);
+>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494
 			}
 		}
 	}
@@ -23,4 +27,8 @@ class LogMaintainer
 		$seconds = $days * 86400;
 		$this->cleaningDir ('../logs/', $seconds);
 	}
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494