diff options
| author | l10n daemon script <[email protected]> | 2016-06-10 09:41:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-06-10 09:41:49 +0000 |
| commit | 0cbc3d195b55644a31db4533613afc1a58b43704 (patch) | |
| tree | 59fcb8e1dd124b8aa11e9967c4f78a1625d228f5 /src/panels/folders/folderspanel.cpp | |
| parent | d48b73349241a46ad70cac5a5ce3e11f641650af (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/panels/folders/folderspanel.cpp')
0 files changed, 0 insertions, 0 deletions