Viewing all changes in revision 786.
- Committer: l10n daemon script
- Date: 2019-07-31 03:17:40 UTC
- Revision ID: git-v1:fa108b8c0390e46819fb1d474dd4229acf06d825
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
