Viewing all changes in revision 1811.
- Committer: l10n daemon script
- Date: 2018-03-13 04:16:05 UTC
- Revision ID: git-v1:18b7892e4f397d77a1bdab319757e33bd8df0377
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:
- debugger/kdevpdb.json
expand all
collapse all
added
removed
