~schumski-deactivatedaccount-deactivatedaccount/kde-gtk-config/trunk

Viewing all changes in revision 549.

  • Committer: l10n daemon script
  • Date: 2019-05-08 03:51:24 UTC
  • Revision ID: git-v1:9b8eb58fdc44819ae2f84649db90493619254b42
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: