Merge pull request #13589 from williamvds/systemctl-edit-copy

author Lennart Poettering <lennart@poettering.net>

Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)

committer GitHub <noreply@github.com>

Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)
committer GitHub <noreply@github.com>
Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)
diff --cc TODO
Simple merge
diff --cc src/basic/strv.h
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)
committer	GitHub <noreply@github.com>
	Thu, 22 Oct 2020 09:19:26 +0000 (11:19 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/strv.h	patch \|	diff1 \|	diff2 \|	blob \| history