SH/PHP_SMART_HOME_V3
2
0 Fork 0
mirror of https://git.steelants.cz/SH/PHP_SMART_HOME_V3.git synced 2026-10-11 17:54:34 +00:00
Code Packages Releases Activity

Merge branch 'remastering' of https://git.steelants.cz/SImple-Home/PHP_SMART_HOME_V3 into remastering

Browse Source
This commit is contained in:
JonatanRek committed 2020-07-21 17:01:28 +02:00
2 parents fa10200bde 03cc627b72
commit 0323323bb1
1 file changed
-8
Download Patch File Download Diff File Expand all files Collapse all files
app/models/managers/LogMaintainer.php
-8
View File
@@ -14,11 +14,7 @@ class LogMaintainer
unlink ($dir . $file); unlink ($dir . $file);
} }
} else { } else {
<<<<<<< HEAD
$this->cleaningDir ($dir . $file . "/", $seconds); $this->cleaningDir ($dir . $file . "/", $seconds);
=======
$this->cleaningDir ($path . $file . "/", $seconds);
>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494
} }
} }
} }
@@ -27,8 +23,4 @@ class LogMaintainer
$seconds = $days * 86400; $seconds = $days * 86400;
$this->cleaningDir ('../logs/', $seconds); $this->cleaningDir ('../logs/', $seconds);
} }
<<<<<<< HEAD
} }
=======
}
>>>>>>> 1a448663f05f2b4ad7456a89d50312be302cd494