« back to all changes in this revision
Viewing changes to org.kde.kolf.desktop
- Committer: l10n daemon script
- Date: 2018-04-18 03:42:01 UTC
- Revision ID: git-v1:378ad25f9f80290736581f6764d6c9e0b4ec80ed
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:
- courses/Impossible
added
removed
org.kde.kolf.desktop
