| commit | 2714c69b3fd23e82841139dbce357eeff3f39eda | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 27 Dec 2015 09:15:05 +0000 (27 09:15 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 27 Dec 2015 09:15:05 +0000 (27 09:15 +0000) | ||
| tree | c53424cefe765cbe418b52702bc6fdf0bd123abe | treesnapshot (tar.gz zip) |
| parent | f92561c4cefec3567f22f8e6b88c0528fb9d56d1 | 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"
| korganizer/kcmconfigs/korganizer_configmain.desktop | diffblobblamehistory |