Merge pull request #17172 from keszybz/read-login-defs

author Lennart Poettering <lennart@poettering.net>

Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)

committer GitHub <noreply@github.com>

Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)
committer GitHub <noreply@github.com>
Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)
diff --cc meson.build
Simple merge
diff --cc src/basic/fs-util.h
Simple merge
diff --cc src/sysusers/sysusers.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)
committer	GitHub <noreply@github.com>
	Fri, 2 Oct 2020 09:01:30 +0000 (11:01 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/fs-util.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/sysusers/sysusers.c	patch \|	diff1 \|	diff2 \|	blob \| history