Closed kawa-kokosowa closed 8 years ago
Tom kept their old test branch after it had been merged, and never fetched, so... there are merge conflicts because of that.
test
In the future ask for code review before merge to master. 👍 I'll do the same for you.
Tom kept their old
test
branch after it had been merged, and never fetched, so... there are merge conflicts because of that.