Merge pull request #2029 from wada314/fix-crlf

author Nick Cameron <nrc@ncameron.org>

Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)

committer GitHub <noreply@github.com>

Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)
author Nick Cameron <nrc@ncameron.org>
Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)
committer GitHub <noreply@github.com>
Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)
diff --cc src/items.rs
Simple merge
diff --cc src/utils.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)
committer	GitHub <noreply@github.com>
	Thu, 5 Oct 2017 12:07:29 +0000 (20:07 +0800)
		1	2
src/items.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history