diff options
| author | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
| commit | b336066e1d3b605853fa3502d31951ff47cc33f0 (patch) | |
| tree | 6101c2efd2efa59941bb8564b61b3b4d9d98e103 /src/statusbar/spaceinfoobserver.cpp | |
| parent | adb7c47885a805c1e8587d24d4767fde22ea15b5 (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/spaceinfoobserver.cpp')
0 files changed, 0 insertions, 0 deletions