mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-06-12 06:10:27 +02:00
Fixed conflict in 'ChangeLog'
This commit is contained in:
commit
4c4a137c9e
@ -17825,3 +17825,6 @@
|
||||
* Added play/stop buttons to cart list in rdlibrary(1)
|
||||
2018-10-17 Patrick Linstruth <patrick@deltecent.com>
|
||||
* Added ability to run macros from cart list view in rdlibrary(1)
|
||||
2018-10-17 Patrick Linstruth <patrick@deltecent.com>
|
||||
* Fixed bug in rdservice(8) where local maintence process was started
|
||||
with RDSERVICE_SYSTEMMAINT_ID instead of RDSERVICE_LOCALMAINT_ID.
|
||||
|
@ -93,7 +93,7 @@ void MainObject::RunSystemMaintRoutine()
|
||||
|
||||
void MainObject::RunLocalMaintRoutine()
|
||||
{
|
||||
RunEphemeralProcess(RDSERVICE_SYSTEMMAINT_ID,
|
||||
RunEphemeralProcess(RDSERVICE_LOCALMAINT_ID,
|
||||
QString(RD_PREFIX)+"/bin/rdmaint",QStringList());
|
||||
|
||||
rda->log(RDConfig::LogInfo,"ran local maintenance routines");
|
||||
|
Loading…
x
Reference in New Issue
Block a user