| commit | 0c7f82e7066f4b212836bcdd72ae4ab61e189c27 | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 19 May 2015 06:06:38 +0000 (19 06:06 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 19 May 2015 06:06:38 +0000 (19 06:06 +0000) | ||
| tree | 06b081afabfa7827eb2917e28c1c1a0274fd1a19 | treesnapshot (tar.gz zip) |
| parent | 70c90a27c77c5fba2c02b0170586e0a52d9d456e | 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"
| src/Gui/trojita.desktop | diffblobblamehistory |