| commit | 8b15a7b825fdf8bfc67a303a0438276f0c7789d6 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 30 Jan 2016 09:37:36 +0000 (30 09:37 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 30 Jan 2016 09:37:36 +0000 (30 09:37 +0000) | ||
| tree | abecc3b8dc778054e7bfe2d4cf761b71760c7555 | treesnapshot (tar.gz zip) |
| parent | dc9d35739e9814d71d3a1aecba85f0f7e3efa526 | commitdiff |
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"
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"
| agents/followupreminderagent/followupreminder.desktop | diffblobblamehistory |