diff options
| author | l10n daemon script <[email protected]> | 2016-03-21 10:58:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-03-21 10:58:51 +0000 |
| commit | 32db592309eeb3473d1e7b31fe2ffe0fd2be7947 (patch) | |
| tree | 62ef89b641f5f3a7a03d71fdacab58aecb370da1 /CMakeLists.txt | |
| parent | 496a2cce6bbdc5e6dadf2f7b0ea1860ecfa9ceb0 (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 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions