Closed MonsieurBibo closed 4 years ago
Could you rebase the changes on the master branch? Currently it's not mergeable, looks like it includes the already merged commits too for some reason.
First time with conflicts. I tried to resolve them. Is it correct now?
Could you rebase the changes on the master branch? Currently it's not mergeable, looks like it includes the already merged commits too for some reason.