diff options
| author | l10n daemon script <[email protected]> | 2019-01-06 05:25:48 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-06 05:25:48 +0100 |
| commit | 1873e2f08fed0397542c04ca02f67efc2fa307d3 (patch) | |
| tree | c9727b289b3c7ee4240f99fe5a3abed04f7ef17b /src/tests/testdir.cpp | |
| parent | 89158c6b3d29b9c01fe9dcc4c2b477dbc80abbdb (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/tests/testdir.cpp')
0 files changed, 0 insertions, 0 deletions