prettier

35f1aae7 - Merge branch 'master' into fast-diff

Merge branch 'master' into fast-diff # Conflicts: # package.json # src/main/core.js # tests/cursor/__snapshots__/jsfmt.spec.js.snap # yarn.lock