diff options
| author | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
| commit | 3b8623b0403a85751a3b48648a541f9534cd3d78 (patch) | |
| tree | a59737f1cd022c05a18772859c3280a737c2e8af /src/dolphinmainwindow.cpp | |
| parent | 7c343f21dd5c156e1a41823ca8984647d85c4ff8 (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/dolphinmainwindow.cpp')
0 files changed, 0 insertions, 0 deletions