Viewing all changes in revision 776.
- Committer: l10n daemon script
- Date: 2019-06-17 03:14:41 UTC
- Revision ID: git-v1:2210866e9a9fafb7f88954d8b7a4d9dfaa81403f
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/application/org.kde.kapptemplate.desktop
expand all
collapse all
added
removed
