Closed PhilippHaefele closed 1 year ago
Oh no, we have a merge conflict because I had just pushed some changes. The package-lock can be regenerated but github will refuse to merge unless the conflicts can be resolved. package.json has important updates in it.
Do you know how to proceed?
I panicked for no reason. Edits were simple
eslint-config-prettier
so we can better use prettier