Merge pull request #20419 from keszybz/setenv-no-value

author Lennart Poettering <lennart@poettering.net>

Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)

committer GitHub <noreply@github.com>

Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)
committer GitHub <noreply@github.com>
Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)
diff --cc src/core/execute.c
Simple merge
diff --cc src/core/manager.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)
committer	GitHub <noreply@github.com>
	Wed, 11 Aug 2021 15:47:45 +0000 (17:47 +0200)
		1	2
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history