Merge pull request #1881 from ajdavis/file-example

author Ben Darnell <ben@bendarnell.com>

Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)

committer GitHub <noreply@github.com>

Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)
author Ben Darnell <ben@bendarnell.com>
Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)
committer GitHub <noreply@github.com>
Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)
diff --cc docs/guide/structure.rst
Simple merge
diff --cc tornado/web.py
Simple merge
author	Ben Darnell <ben@bendarnell.com>
	Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)
committer	GitHub <noreply@github.com>
	Sun, 20 Nov 2016 09:14:48 +0000 (17:14 +0800)
		1	2
docs/guide/structure.rst	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/web.py	patch \|	diff1 \|	diff2 \|	blob \| history