~neon/marble/master

Viewing all changes in revision 12148.

  • Committer: l10n daemon script
  • Date: 2019-08-25 02:50:26 UTC
  • Revision ID: git-v1:165168b0cb255c79e34ffd9cb85426acf2b96faf
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: