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

Viewing all changes in revision 501.

  • Committer: l10n daemon script
  • Date: 2018-11-01 04:57:52 UTC
  • Revision ID: git-v1:f97fc7be8b3d20923e16b891cf469c8a59d1e5e4
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: