Viewing all changes in revision 619.
- Committer: l10n daemon script
- Date: 2019-02-11 04:28:26 UTC
- Revision ID: git-v1:99f64886d8993400ff817aa3969bb354c3e1a494
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.kgrapheditor.desktop
expand all
collapse all
added
removed
