diff options
| author | l10n daemon script <[email protected]> | 2015-11-17 12:50:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-17 12:50:56 +0000 |
| commit | e0dfcb9e1dc6a9dc210792231b84bd59e907366b (patch) | |
| tree | f139bc1c181cac2d3e5b8f5634f7434f9b322d38 /src/dolphinrecenttabsmenu.cpp | |
| parent | c96add9c68b0826b3657729d902bf9dd891f2a16 (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/dolphinrecenttabsmenu.cpp')
0 files changed, 0 insertions, 0 deletions