Merge pull request #3284 from scampi/issue-3270

author Nick Cameron <nrc@ncameron.org>

Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)

committer GitHub <noreply@github.com>

Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)
author Nick Cameron <nrc@ncameron.org>
Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)
committer GitHub <noreply@github.com>
Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)
diff --cc src/comment.rs
Simple merge
diff --cc src/utils.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)
committer	GitHub <noreply@github.com>
	Thu, 17 Jan 2019 07:22:36 +0000 (20:22 +1300)
		1	2
src/comment.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history