~neon/kmahjongg/master

Viewing all changes in revision 1043.

  • Committer: l10n daemon script
  • Date: 2018-12-24 04:21:16 UTC
  • Revision ID: git-v1:cb4c2833dc6ba513c64f0be8feac23fd55a77fc8
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: