~neon/libkcddb/master

Viewing all changes in revision 641.

  • Committer: l10n daemon script
  • Date: 2018-10-10 04:38:08 UTC
  • Revision ID: git-v1:702eb32c6f76f0b7a514a3b99bbd5f970f30d839
Tags: v18.11.80, v19.03.90, v19.04.0, v19.04.1, v19.04.2, v19.07.80, v19.08.0, v19.08.2
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: