Merge pull request #16112 from poettering/nss-systemd-block-fix

author Lennart Poettering <lennart@poettering.net>

Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)

committer GitHub <noreply@github.com>

Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)
committer GitHub <noreply@github.com>
Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)
diff --cc meson.build
Simple merge
diff --cc src/locale/localed.c
Simple merge
diff --cc src/userdb/userwork.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)
committer	GitHub <noreply@github.com>
	Wed, 24 Jun 2020 06:39:44 +0000 (08:39 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/locale/localed.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/userdb/userwork.c	patch \|	diff1 \|	diff2 \|	blob \| history