Closed maksz42 closed 2 years ago
Could you resolve conflicts and rebase to master?
Rebased, I guess that's not how you do it but I deleted package-lock.json and regenerated it with npm install.
Could you resolve conflicts and rebase to master?