PR#11 now has merging conflicts
Closed this issue · 1 comments
RieksJ commented
When I created PR#11, everything was ok - it said it could be merged.
When I look now, there are conflicts (in the README file, where Oliver Terbu appears to have added his contribution).
My Git-capabilities are not that evolved that I know how to resolve those.
Can anyone help out?
elenachachkarova commented
No problem at all, should be all merged now. You will receive an email with a promo code soon. Thank you for submitting your paper again.