~neon/marble/master

Viewing all changes in revision 12115.

  • Committer: l10n daemon script
  • Date: 2018-12-25 04:27:15 UTC
  • Revision ID: git-v1:b02a82602a7f69597f54cbd2b5b011576e068a42
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: