2 Commits

Author	SHA1	Message	Date
Miles Gould	d301f2f2ae	Add static check for files with merge conflicts ... Fixes #1146	2017-02-07 15:03:52 +00:00
Miles Gould	3fed962dcc	Add script/check_static to run all static checks ... ...and invoke it from .travis.yml	2017-02-07 14:27:14 +00:00