~neon/libkipi/master

Viewing all changes in revision 1170.

  • Committer: l10n daemon script
  • Date: 2018-10-10 04:37:07 UTC
  • Revision ID: git-v1:5a2486a489ceed07e032dc8290bc90c556a0140b
Tags: v18.11.80, v18.11.90, v18.12.0, v18.12.3
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: