Re: Fedora Media Writer translations merge conflict

Hi,

This seems to be the case again. May I please ask for a fix for the merge conflict?

Thank you.

Regards,

Jan

čt 14. 9. 2023 v 9:06 odesílatel Jan Grulich <jgrulich@redhat.com> napsal:

Thank you for fixing it!

Regards,

Jan

čt 14. 9. 2023 v 8:54 odesílatel Rafael Fontenelle <rafaelff@gnome.org> napsal:

Hi,

Just for the record, I closed the issue #645 because alerts are now gone and the translation update PR #646 was open.

Cheers,

Rafael

On Thu, Sep 14, 2023 at 2:44 AM Jan Grulich <jgrulich@redhat.com> wrote:

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@lists.fedoraproject.org
To unsubscribe send an email to trans-leave@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

_______________________________________________
trans mailing list -- trans@lists.fedoraproject.org
To unsubscribe send an email to trans-leave@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