Elliot DeNolf 27ae8ca4f1 Fix conflicts

2020-04-12 21:47:48 -04:00

..

integration

Resolve conflicts

2020-04-12 21:46:11 -04:00

unit

Resolve conflicts

2020-04-12 21:46:11 -04:00

jest.config.integration.js

Resolve conflicts

2020-04-12 21:46:11 -04:00

jest.config.js

remove unfinished test config changes

2019-10-29 10:18:06 -04:00