« back to all changes in this revision
Viewing changes to org.kde.kruler.desktop
- Committer: l10n daemon script
- Date: 2020-06-17 12:03:20 UTC
- Revision ID: git-v1:147dec5d046e42f51aa93f5b867d1e8a117c72f3
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:
- kruler.notifyrc
added
removed
org.kde.kruler.desktop
