Viewing all changes in revision 640.
- Committer: l10n daemon script
- Date: 2019-08-03 03:03:01 UTC
- Revision ID: git-v1:55dda14afc9b47c6b4e53b98d58b8c086b343f57
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
