Merge pull request #25180 from keszybz/ukify

author Lennart Poettering <lennart@poettering.net>

Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)

committer GitHub <noreply@github.com>

Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)
committer GitHub <noreply@github.com>
Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)
diff --cc man/rules/meson.build
Simple merge
diff --cc meson.build
Simple merge
diff --cc src/shared/bootspec.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)
committer	GitHub <noreply@github.com>
	Thu, 8 Dec 2022 14:11:18 +0000 (15:11 +0100)
		1	2
man/rules/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bootspec.c	patch \|	diff1 \|	diff2 \|	blob \| history