Merge branch 'master' into github-actions

author Luke Lau <luke_lau@icloud.com>

Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)

committer Luke Lau <luke_lau@icloud.com>

Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)
author Luke Lau <luke_lau@icloud.com>
Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)
committer Luke Lau <luke_lau@icloud.com>
Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)
diff --cc README.md
Simple merge
diff --cc test/Test.hs
Simple merge
author	Luke Lau <luke_lau@icloud.com>
	Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)
committer	Luke Lau <luke_lau@icloud.com>
	Mon, 25 Nov 2019 17:24:41 +0000 (17:24 +0000)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
test/Test.hs	patch \|	diff1 \|	diff2 \|	blob \| history