Merge pull request #26726 from DaanDeMeyer/cleanups

author Daan De Meyer <daan.j.demeyer@gmail.com>

Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)

committer GitHub <noreply@github.com>

Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)
committer GitHub <noreply@github.com>
Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)
diff --cc src/basic/meson.build
Simple merge
diff --cc src/shared/data-fd-util.c
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)
committer	GitHub <noreply@github.com>
	Fri, 10 Mar 2023 13:22:53 +0000 (14:22 +0100)
		1	2
src/basic/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/data-fd-util.c	patch \|	diff1 \|	diff2 \|	blob \| history