Merge pull request #14696 from poettering/dissect-tweaks

author Anita Zhang <the.anitazha@gmail.com>

Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)

committer GitHub <noreply@github.com>

Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)
author Anita Zhang <the.anitazha@gmail.com>
Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)
committer GitHub <noreply@github.com>
Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)
diff --cc TODO
Simple merge
diff --cc src/shared/gpt.h
Simple merge
author	Anita Zhang <the.anitazha@gmail.com>
	Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)
committer	GitHub <noreply@github.com>
	Thu, 30 Jan 2020 20:46:03 +0000 (12:46 -0800)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/gpt.h	patch \|	diff1 \|	diff2 \|	blob \| history