~neon/phonon/vlc

Viewing all changes in revision 646.

  • Committer: l10n daemon script
  • Date: 2018-12-29 01:48:29 UTC
  • Revision ID: git-v1:54ae047d359095cfde8286505c3c55dcd5509f19
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: