Viewing all changes in revision 29.
- Committer: l10n daemon script
- Date: 2015-04-03 04:49:15 UTC
- Revision ID: git-v1:20dfa068620a7fcbb30932c57f19d817a44c930f
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"
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"
- files modified:
- plasma-runner-flickr.desktop
expand all
collapse all
added
removed
