~blue-shell/blue-shell/flickr-runner

Viewing all changes in revision 31.

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