fix: Apply prettier to merged files

Signed-off-by: Cameron Diver <cameron@resin.io>
This commit is contained in:
Cameron Diver 2018-08-28 16:00:58 -07:00 committed by Tim Perry
parent dac45a884e
commit 63c3d7ceee