Viewing all changes in revision 590.
- Committer: l10n daemon script
- Date: 2016-06-12 09:44:16 UTC
- Revision ID: git-v1:a9508c0a8c24e7bd65a27a4f84abd6efcfc4f5ce
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:
- print-manager-kded/printmanager.notifyrc
expand all
collapse all
added
removed
