Merge pull request #29995 from keszybz/voidify-timestamp-getters

author Lennart Poettering <lennart@poettering.net>

Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)

committer GitHub <noreply@github.com>

Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)
author Lennart Poettering <lennart@poettering.net>
Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)
committer GitHub <noreply@github.com>
Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)
diff --cc meson.build
Simple merge
diff --cc src/core/manager.c
Simple merge
diff --cc src/systemctl/systemctl-show.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)
committer	GitHub <noreply@github.com>
	Mon, 13 Nov 2023 13:41:42 +0000 (14:41 +0100)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemctl/systemctl-show.c	patch \|	diff1 \|	diff2 \|	blob \| history