Viewing all changes in revision 485.
- Committer: l10n daemon script
- Date: 2018-12-18 04:33:57 UTC
- Revision ID: git-v1:17b3786aa155fc1aabd6d3fd22df2c7ff549c0ba
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:
- src/org.kde.blinken.desktop
expand all
collapse all
added
removed
