Viewing all changes in revision 917.
- Committer: l10n daemon script
- Date: 2018-12-25 04:27:04 UTC
- Revision ID: git-v1:de330e09b0e2b116316be39fc6f4c6e0dda91c2d
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.kturtle.desktop
expand all
collapse all
added
removed
