~neon/kde-dev-utils/master

Viewing all changes in revision 416.

  • Committer: l10n daemon script
  • Date: 2018-08-27 03:50:04 UTC
  • Revision ID: git-v1:35f0abcf0b0909033bee89adb8afaa42bba4b0c0
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: