Viewing all changes in revision 720.
- Committer: l10n daemon script
- Date: 2022-09-28 01:54:26 UTC
- Revision ID: git-v1:7870a2e5b3880ddd57c315fdbfe2d748a83404a9
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:
- kcmcddb/libkcddb.desktop
expand all
collapse all
added
removed
