Viewing all changes in revision 687.
- Committer: l10n daemon script
- Date: 2018-04-18 03:42:07 UTC
- Revision ID: git-v1:89cfe3c61ad016970d7dc5bafed7cc3fdddd62d6
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:
- ksirk/org.kde.ksirk.desktop
expand all
collapse all
added
removed
