Fedora Media Writer translations merge conflict

Jan Grulich <[email protected]> Thu, 14 Sep 2023 07:44:15 +0200
Newsgroups gmane.linux.redhat.internationalization
Message-ID <CANw2QM5GeEZwqb8TYP8=bRVz-taLR51bvvxa1U+2R4TnvJAYOA@mail.gmail.com>
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 -- [email protected]
To unsubscribe send an email to [email protected]
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/[email protected]
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue