~neon/kshisen/master

Viewing all changes in revision 1069.

  • Committer: l10n daemon script
  • Date: 2018-05-18 03:41:46 UTC
  • Revision ID: git-v1:dcab07b437cb0bf9725755a46c9d4a60e64da583
Tags: v18.07.80, v18.07.90, v18.08.0, v18.08.1, v18.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: