~neon/klines/master

Viewing all changes in revision 620.

  • Committer: l10n daemon script
  • Date: 2018-09-22 04:05:02 UTC
  • Revision ID: git-v1:daaa5d562452e2a4f5d1275cd20e526547641a10
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: