Merge pull request #8296 from poettering/resolvconf

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)

committer GitHub <noreply@github.com>

Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)
committer GitHub <noreply@github.com>
Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)
diff --cc man/rules/meson.build
Simple merge
diff --cc meson.build
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)
committer	GitHub <noreply@github.com>
	Mon, 12 Mar 2018 16:27:39 +0000 (17:27 +0100)
		1	2
man/rules/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history