~neon/ksudoku/master

Viewing all changes in revision 780.

  • Committer: l10n daemon script
  • Date: 2018-10-10 04:34:54 UTC
  • Revision ID: git-v1:071d034b0a47311eb3d18d68dfc5ddbb88e7e114
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: