Viewing all changes in revision 2537.
- Committer: l10n daemon script
- Date: 2018-12-29 11:21:28 UTC
- Revision ID: git-v1:3732650697303d42002b6fb329275e7dfe3e4237
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/kile.desktop
expand all
collapse all
added
removed
