Merge pull request #793 from ChungZH/patch-2

author Ir1dXD <sirius.caffrey@gmail.com>

Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)

committer GitHub <noreply@github.com>

Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)
author Ir1dXD <sirius.caffrey@gmail.com>
Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)
committer GitHub <noreply@github.com>
Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)
diff --cc README.md
Simple merge
diff --cc docs/index.md
Simple merge
author	Ir1dXD <sirius.caffrey@gmail.com>
	Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)
committer	GitHub <noreply@github.com>
	Wed, 28 Nov 2018 17:18:16 +0000 (01:18 +0800)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/index.md	patch \|	diff1 \|	diff2 \|	blob \| history