Viewing all changes in revision 3254.
- Committer: l10n daemon script
- Date: 2018-01-10 06:04:06 UTC
- Revision ID: git-v1:b71aa7ee18144ca4580646913d1635a22837e0ed
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/org.kde.parley.desktop
expand all
collapse all
added
removed
