Merge pull request #12378 from rbalint/vt-kbd-reset-check

author Lennart Poettering <lennart@poettering.net>

Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)

committer GitHub <noreply@github.com>

Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)
committer GitHub <noreply@github.com>
Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)
diff --cc src/basic/terminal-util.c
Simple merge
diff --cc src/basic/terminal-util.h
Simple merge
diff --cc src/vconsole/vconsole-setup.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)
committer	GitHub <noreply@github.com>
	Thu, 16 May 2019 14:39:38 +0000 (16:39 +0200)
		1	2
src/basic/terminal-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/terminal-util.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/vconsole/vconsole-setup.c	patch \|	diff1 \|	diff2 \|	blob \| history