Merge pull request #14547 from keszybz/networkctl-matching

author Yu Watanabe <watanabe.yu+github@gmail.com>

Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)

committer GitHub <noreply@github.com>

Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)
committer GitHub <noreply@github.com>
Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)
diff --cc src/analyze/analyze.c
Simple merge
diff --cc src/network/networkctl.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)
committer	GitHub <noreply@github.com>
	Wed, 15 Jan 2020 02:56:01 +0000 (11:56 +0900)
		1	2
src/analyze/analyze.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkctl.c	patch \|	diff1 \|	diff2 \|	blob \| history