Merge pull request #14156 from fbuihuu/deal-with-aliases-when-disabling

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

Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)

committer GitHub <noreply@github.com>

Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)
committer GitHub <noreply@github.com>
Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)
diff --cc src/core/unit.c
Simple merge
diff --cc src/shared/install.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)
committer	GitHub <noreply@github.com>
	Thu, 6 Feb 2020 09:46:21 +0000 (10:46 +0100)
		1	2
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/install.c	patch \|	diff1 \|	diff2 \|	blob \| history