~neon/kapptemplate/master

Viewing all changes in revision 816.

  • Committer: l10n daemon script
  • Date: 2020-06-18 03:47:52 UTC
  • Revision ID: git-v1:19c5121e0b6f49d0791e3d52357de26f3dfc9371
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: