Viewing all changes in revision 195.
- Committer: l10n daemon script
- Date: 2015-11-05 04:17:01 UTC
- Revision ID: git-v1:3e0eae53c7faff2d2e70dab68cc9e17c427f028a
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:
- nepomukshell.desktop
expand all
collapse all
added
removed
