Merge pull request #7991 from poettering/n-on-console

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

Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)

committer GitHub <noreply@github.com>

Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)
committer GitHub <noreply@github.com>
Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)
diff --cc src/core/manager.c
Simple merge
diff --cc src/core/manager.h
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)
committer	GitHub <noreply@github.com>
	Thu, 25 Jan 2018 10:48:08 +0000 (13:48 +0300)
		1	2
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.h	patch \|	diff1 \|	diff2 \|	blob \| history