Viewing all changes in revision 193.
- Committer: l10n daemon script
- Date: 2015-06-06 04:26:43 UTC
- Revision ID: git-v1:baaa5822b2075aaab64447ee8c876b72b1798585
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
