~blue-shell-next/koko/master

Viewing all changes in revision 433.

  • Committer: l10n daemon script
  • Date: 2019-05-20 03:39:22 UTC
  • Revision ID: git-v1:6c051b9ee4d78401c217e6f7f282f06efde84c59
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: