Closed nimasmi closed 4 years ago
Hi, thanks for your contribution here!
Unfortunately, there are some conflicts to be resolved here.
Isn't this a duplicate of pull request #1578 (which fixed issue #1570 for English)?
That pull request #1578 has already been merged is probably also the reason that there are merge conflicts with this pull request here.
That might explain it. I pulled from upstream on Saturday, but hadn't seen the changes in #1578. I'll pull again and check.
I have rebased and force-pushed. Hopefully it's okay now. My editor has added a couple of newline characters at the end of files. I hope that's okay.
The output from git is given as though a first commit has already been made. This corrects it to show that no commits have been made yet.