http://bugzilla.opensuse.org/show_bug.cgi?id=1049195
http://bugzilla.opensuse.org/show_bug.cgi?id=1049195#c4
Stanislav Brabec changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |IN_PROGRESS
--- Comment #4 from Stanislav Brabec ---
There are merge conflicts for update-desktop-files, zypper and
yast-translations.
Normally, I do a conflict resolution during next day. But this time, openSUSE
team migrated the server to a new VPN and I have no access to it in the last
week.
Now I ran the merge. Weblate has to parse all files, and if no more conflics
appear, changes will be pushed.
--
You are receiving this mail because:
You are on the CC list for the bug.