Viewing all changes in revision 559.
- Committer: l10n daemon script
- Date: 2019-05-20 03:32:54 UTC
- Revision ID: git-v1:d4dcf5ad69f1e96f896e3b56e2ca6e7cd548120e
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
