Viewing all changes in revision 2602.
- Committer: l10n daemon script
- Date: 2018-12-29 01:47:52 UTC
- Revision ID: git-v1:e56d15ec6ae10b3595410473d4650cb241e4d84d
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/data/rekonq.desktop
expand all
collapse all
added
removed
