diff options
| author | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
| commit | 07dae709d9fe68283caa71d13468b3edc4f0e2be (patch) | |
| tree | f317df1201588aa67e72ee524db78360b57691c2 /src/dbusinterface.cpp | |
| parent | f5fd8e5cfb43deb1ccb0fef76e335afbde088965 (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