Merge pull request #15278 from vcaputo/more-trivial-cleanups

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

Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)

committer GitHub <noreply@github.com>

Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)
committer GitHub <noreply@github.com>
Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)
diff --cc src/home/homed-home.c
Simple merge
diff --cc src/home/homework.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)
committer	GitHub <noreply@github.com>
	Tue, 31 Mar 2020 22:16:56 +0000 (00:16 +0200)
		1	2
src/home/homed-home.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/home/homework.c	patch \|	diff1 \|	diff2 \|	blob \| history