Merge pull request #17549 from yuwata/tiny-fixes

author Lennart Poettering <lennart@poettering.net>

Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)

committer GitHub <noreply@github.com>

Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)
author Lennart Poettering <lennart@poettering.net>
Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)
committer GitHub <noreply@github.com>
Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)
diff --cc src/core/load-fragment.c
Simple merge
diff --cc src/home/homed-manager.c
Simple merge
diff --cc src/libsystemd/sd-bus/bus-message.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)
committer	GitHub <noreply@github.com>
	Mon, 9 Nov 2020 15:04:01 +0000 (16:04 +0100)
		1	2
src/core/load-fragment.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/home/homed-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-bus/bus-message.c	patch \|	diff1 \|	diff2 \|	blob \| history