diff options
| author | l10n daemon script <scripty@kde.org> | 2020-05-31 20:18:31 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-05-31 20:18:31 +0200 |
| commit | 94b1b005b87bce66f88897db7433c602f9deb49b (patch) | |
| tree | 6bab19effc0a95c9adb66f5410c9581f7aa95b5f /cmake/rules_PyKF5.py | |
| parent | d57a4a0d1ef51b3861745480e536724740c171d7 (diff) | |
| download | kconfig-94b1b005b87bce66f88897db7433c602f9deb49b.tar.gz kconfig-94b1b005b87bce66f88897db7433c602f9deb49b.tar.bz2 | |
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"
Diffstat (limited to 'cmake/rules_PyKF5.py')
0 files changed, 0 insertions, 0 deletions