Viewing all changes in revision 594.
- Committer: l10n daemon script
- Date: 2020-05-05 04:03:07 UTC
- Revision ID: git-v1:a0ee7fbba54a4f4bc1a3ac70d4cca1ad69218570
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/yakuake.notifyrc
expand all
collapse all
added
removed
