~neon/plasma-widget-networkmanagement/trunk

Viewing all changes in revision 2537.

  • Committer: l10n daemon script
  • Date: 2018-04-29 00:07:30 UTC
  • Revision ID: git-v1:d8fc653b58e5b6aed06258e712b7bc435068354f
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: