Viewing all changes in revision 533.
- Committer: l10n daemon script
- Date: 2018-05-02 03:30:06 UTC
- Revision ID: git-v1:86a58e320e7abdd8456ca83ca7deb7d3683c72f4
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.knetwalk.desktop
expand all
collapse all
added
removed
