diff options
| author | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
| commit | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (patch) | |
| tree | deed68addb9d84edd3450a6d34102b222db13b1c /src/statusbar/statusbarspaceinfo.cpp | |
| parent | 090f3e90ea4ce43c6d5e90c7b82c13a52222c72c (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/statusbar/statusbarspaceinfo.cpp')
0 files changed, 0 insertions, 0 deletions