Sean King 49ad44bcd4 Fix merge conflicts hopefully

2020-09-28 20:31:24 -06:00

..

__tests__

fix language picker dropdown arrow

2020-09-28 10:51:42 -05:00

forkawesome.json

…

index.js

Fix merge conflicts hopefully

2020-09-28 20:31:24 -06:00