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

Viewing all changes in revision 557.

  • Committer: l10n daemon script
  • Date: 2019-06-04 03:27:11 UTC
  • Revision ID: git-v1:a08176a9f1923ab909360498639124f1216c00d0
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: