Re: Fedora Media Writer translations merge conflict

Hi, Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645? The repository for Fedora Media Writer cannot now merge changes as there is a conflict. Thank you. Regards, Jan Grulich _______________________________________________ trans mailing list -- trans(a)lists.fedoraproject.org To unsubscribe send an email to trans-leave(a)lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue