Merge pull request #13212 from poettering/sleep-conf-default

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

Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)

committer GitHub <noreply@github.com>

Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)
committer GitHub <noreply@github.com>
Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)
diff --cc TODO
Simple merge
diff --cc src/shared/sleep-config.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)
committer	GitHub <noreply@github.com>
	Mon, 29 Jul 2019 14:03:54 +0000 (16:03 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/sleep-config.c	patch \|	diff1 \|	diff2 \|	blob \| history