diff options
| author | l10n daemon script <scripty@kde.org> | 2015-04-07 13:15:22 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-04-07 13:15:22 +0000 |
| commit | 390178b4a6f7d3621b0593e3b73fdb3d13ac0e57 (patch) | |
| tree | 43bb3d5f562176052a29fa18708659a5d09e3558 /autotests/test_kconfigutils.cpp | |
| parent | 8b0b6a14688bc2b3785b646d13c78cd54de73262 (diff) | |
| download | kconfig-390178b4a6f7d3621b0593e3b73fdb3d13ac0e57.tar.gz kconfig-390178b4a6f7d3621b0593e3b73fdb3d13ac0e57.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 'autotests/test_kconfigutils.cpp')
0 files changed, 0 insertions, 0 deletions