diff options
| author | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
| commit | e6dc4739c3c7373f203a27cde2e31f8de1811e3a (patch) | |
| tree | 9efbf8d07ef03e85bc43f5b88e934a69bdca4d2e /src/tests/kfileitemmodeltest.cpp | |
| parent | a516f46b44b0ac5b770a2065a9da15ba97d4a3b0 (diff) | |
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 'src/tests/kfileitemmodeltest.cpp')
0 files changed, 0 insertions, 0 deletions