Closed dakixr closed 2 years ago
I've included all your changes in my commits (Note: for easing the conflicts)
This PR is conflicting. Please see the changes in the about page. Probably the ones I did a while ago
I have included all your changes in my commits
No, otherwise I would be able to merge the PR. It tells me that there are 2 files with conflicts: README.md and about.html
The thing is that I've done it manually. Copying and pasting your changes into my branch, instead of pulling your changes. But I can assure you that in my pull request all your changes are reflected
It's not a matter of trust :) It's just that I can't merge the pr:
I will try to solve the conflicts by hand
36
37
38
39
40
41
42
44
45
47