Merge pull request #7120 from electron/lint-docs

author Zeke Sikelianos <zeke@github.com>

Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)

committer GitHub <noreply@github.com>

Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)
author Zeke Sikelianos <zeke@github.com>
Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)
committer GitHub <noreply@github.com>
Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)
diff --cc package.json
Simple merge
diff --cc script/upload.py
Simple merge
author	Zeke Sikelianos <zeke@github.com>
	Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)
committer	GitHub <noreply@github.com>
	Fri, 16 Sep 2016 21:05:32 +0000 (14:05 -0700)
		1	2
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
script/upload.py	patch \|	diff1 \|	diff2 \|	blob \| history