diff options
| author | l10n daemon script <[email protected]> | 2016-04-03 09:50:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-04-03 09:50:58 +0000 |
| commit | 0c904334781084533e699b95f9c2dde3a9833fcf (patch) | |
| tree | aaf9e85b1d5e80f8d396e50886edcc665ccefab5 /src/dbusinterface.cpp | |
| parent | 32db592309eeb3473d1e7b31fe2ffe0fd2be7947 (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/dbusinterface.cpp')
0 files changed, 0 insertions, 0 deletions