~schumski-deactivatedaccount-deactivatedaccount/muon/trunk

Viewing all changes in revision 2701.

  • Committer: l10n daemon script
  • Date: 2022-06-25 02:02:14 UTC
  • Revision ID: git-v1:a7cc1a313b3d75e2999613e674af7b7c4193b267
SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: