SH/PHP_SMART_HOME_V3
SH
/
PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

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

This commit is contained in:
Václav Španinger 2020-07-21 17:01:28 +02:00
parent fa10200bde 03cc627b72
commit 0323323bb1
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/managers/LogMaintainer.php
View File

@ -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