Jean-François Milants 5fdfb2112e Fix merge conflict.

2021-02-14 14:19:30 +01:00

..

SystemMonitor.h

Replaced NULL with nullptr

2020-10-04 15:09:17 +03:00

SystemTask.cpp

Fix merge conflict.

2021-02-14 14:19:30 +01:00

SystemTask.h

Fix merge conflict.

2021-02-14 14:19:30 +01:00