Viewing all changes in revision 555.
- Committer: l10n daemon script
- Date: 2019-01-06 04:30:34 UTC
- Revision ID: git-v1:460fcb3173d87e3ceaf5e6c65d732fa02d740266
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:
- data/org.kde.yakuake.desktop
expand all
collapse all
added
removed
