~telepathy-kde/telepathy-kde/ktp-text-ui

Viewing all changes in revision 1455.

  • Committer: l10n daemon script
  • Date: 2017-10-23 02:37:35 UTC
  • Revision ID: git-v1:ac5524ee222d130034b3ccad523036acf76e241f
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: