projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17884fe) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 15 Feb 2017 07:00:01 +0000 (08:00 +0100)
committerl10n daemon script <scripty@kde.org>
Wed, 15 Feb 2017 07:00:01 +0000 (08:00 +0100)
commitc63be8ce50c0a8bbe76e5ed727a8950250c98927
tree24edb0b51703263cc84ae733fecb13ab57dbbe22tree | snapshot
parent17884feb99cfa6bb3fc0fafdac9c0623f89ba6f7commit | 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"
src/analyze/gui/org.kde.heaptrack.desktop diff | blob | history
Domain: SDK / Command line tools;