Viewing all changes in revision 553.
- Committer: l10n daemon script
- Date: 2018-12-28 04:27:18 UTC
- Revision ID: git-v1:bc22d4d962331972df8d09ba4f9f7140631415a4
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:
- data/org.kde.yakuake.desktop
expand all
collapse all
added
removed
