Merge pull request #30867 from dtardon/udev-conf-dropins

author Yu Watanabe <watanabe.yu+github@gmail.com>

Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)

committer GitHub <noreply@github.com>

Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)
committer GitHub <noreply@github.com>
Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)
diff --cc man/rules/meson.build
Simple merge
diff --cc src/shared/conf-parser.c
Simple merge
diff --cc src/shared/conf-parser.h
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)
committer	GitHub <noreply@github.com>
	Thu, 11 Jan 2024 21:37:23 +0000 (06:37 +0900)
		1	2
man/rules/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/conf-parser.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/conf-parser.h	patch \|	diff1 \|	diff2 \|	blob \| history