~neon/project-neon/kscreen

Viewing all changes in revision 530.

  • Committer: l10n daemon script
  • Date: 2019-01-06 04:42:28 UTC
  • Revision ID: git-v1:1c1c9ba5b4304bc100de7cc2a0ce409291afb07a
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: