Joe Previte 9e61540840 fix: resolve conflicts in package.json ...

I hope this was done correctly.

It upgraded a few packages, we left out the electron packages and it added two
resolutions.

2021-02-25 11:52:27 -07:00

..

vscode

fix: resolve conflicts in package.json

2021-02-25 11:52:27 -07:00