Viewing all changes in revision 1117.
- Committer: l10n daemon script
- Date: 2018-12-18 04:34:10 UTC
- Revision ID: git-v1:69a05105e1513dad499c6eaad1d5b6e06b9f5d05
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.kanagram.desktop
expand all
collapse all
added
removed
