~neon/kajongg/master

Viewing all changes in revision 3751.

  • Committer: l10n daemon script
  • Date: 2019-07-14 03:14:37 UTC
  • Revision ID: git-v1:ef725faef08cddd5fc96b9a5ef4d01c18d29b64e
Tags: v19.07.80
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: