Maxime Beauchemin 2eeff2ae0b Fix the build (#5403) ...

The travis build has been failing for 2 reasons recently
* pylint takes > 10 minutes without outputing
* bad merge confict auto resolve in controls.jsx

2018-07-16 11:46:13 -07:00

138 B

Raw Blame History

View Raw