Merge pull request #36 from ellerh/resize-file-limit

author Phil Burk <philburk@mobileer.com>

Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)

committer GitHub <noreply@github.com>

Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)
author Phil Burk <philburk@mobileer.com>
Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)
committer GitHub <noreply@github.com>
Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)
diff --cc fth/file.fth
Simple merge
diff --cc fth/system.fth
Simple merge
author	Phil Burk <philburk@mobileer.com>
	Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)
committer	GitHub <noreply@github.com>
	Mon, 16 Jan 2017 04:28:45 +0000 (20:28 -0800)
		1	2
fth/file.fth	patch \|	diff1 \|	diff2 \|	blob \| history
fth/system.fth	patch \|	diff1 \|	diff2 \|	blob \| history