Viewing all changes in revision 552.
- Committer: l10n daemon script
- Date: 2018-12-24 04:18:59 UTC
- Revision ID: git-v1:12bb5e307d5c0bc1b39c60ac4bacf6faa4cc4d7f
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
