Skip to content

Updated deps, fixed lints, applied prettier v2 style#222

Merged
ErikBjare merged 2 commits into
masterfrom
dev/update-deps-2020
Jul 16, 2020
Merged

Updated deps, fixed lints, applied prettier v2 style#222
ErikBjare merged 2 commits into
masterfrom
dev/update-deps-2020

Conversation

@ErikBjare
Copy link
Copy Markdown
Member

@ErikBjare ErikBjare commented Jul 16, 2020

We should probably merge these first (at the very least):

Easier to rebase this on top of them (since this is mostly just a make lint-fix) than the other way around.

@ErikBjare ErikBjare force-pushed the dev/update-deps-2020 branch from 7772ab2 to d185497 Compare July 16, 2020 11:57
@johan-bjareholt
Copy link
Copy Markdown
Member

I fixed the merge conflicts with master and force pushed.

@ErikBjare
Copy link
Copy Markdown
Member Author

@johan-bjareholt Nice, merging once CI passes.

@ErikBjare ErikBjare merged commit 91878ee into master Jul 16, 2020
@ErikBjare ErikBjare deleted the dev/update-deps-2020 branch July 16, 2020 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants