Viewing all changes in revision 608.
- Committer: l10n daemon script
- Date: 2018-02-22 04:18:27 UTC
- Revision ID: git-v1:66d1d4c488edca039104e91c9b47d718201293c3
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:
- org.kde.kfloppy.desktop
expand all
collapse all
added
removed
