Viewing all changes in revision 815.
- Committer: l10n daemon script
- Date: 2018-03-25 04:29:44 UTC
- Revision ID: git-v1:884538a242dbcd84f975c9c17270335b589fa205
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.kfourinline.desktop
expand all
collapse all
added
removed
