Viewing all changes in revision 5965.
- Committer: l10n daemon script
- Date: 2019-01-11 04:38:41 UTC
- Revision ID: git-v1:a6e788efe2a9f040fcbf638fda3a51b3a3e1d412
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/k3b.notifyrc
expand all
collapse all
added
removed
