~schumski-deactivatedaccount-deactivatedaccount/k3b/master

Viewing all changes in revision 5999.

  • Committer: l10n daemon script
  • Date: 2019-04-13 03:38:43 UTC
  • Revision ID: git-v1:dd5059ed423b22cfa60c2ee4f37606f84e350f80
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: