~neon/kmouth/master

Viewing all changes in revision 615.

  • Committer: l10n daemon script
  • Date: 2020-03-31 04:20:15 UTC
  • Revision ID: git-v1:a2b534fb283dbce834ba074d2b7f69b1ecf2f92d
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: