Viewing all changes in revision 633.
- Committer: l10n daemon script
- Date: 2019-04-30 03:46:37 UTC
- Revision ID: git-v1:9cde79ed75f07d49333ea8e5d96d9bfa5a852f0e
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:
- org.kde.klines.desktop
expand all
collapse all
added
removed
