~neon/kdeartwork/trunk

Viewing all changes in revision 2857.

  • Committer: scripty
  • Date: 2015-03-26 04:46:57 UTC
  • Revision ID: svn-v4:283d02a7-25f6-0310-bc7c-ecb5cbfe19da:trunk/KDE/kdeartwork:1420161
SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: