~ubuntu-touch-coreapps-drivers/trojita/git-kde

Viewing all changes in revision 5114.

  • Committer: l10n daemon script
  • Date: 2023-11-26 01:17:33 UTC
  • Revision ID: git-v1:eb951c7c6890b61e2e0629294ec0d42818e1748d
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: