~neon/kdegraphics/gwenview

Viewing all changes in revision 3289.

  • Committer: l10n daemon script
  • Date: 2016-11-23 03:20:46 UTC
  • Revision ID: git-v1:57215b06c7f14803fb24c2408f86c48cbbbdb934
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: