projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 39136bb) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 19 Feb 2017 06:37:47 +0000 (07:37 +0100)
committerl10n daemon script <scripty@kde.org>
Sun, 19 Feb 2017 06:37:47 +0000 (07:37 +0100)
commit4ca6c2ffcb99e419d711c3435dc4f6128372a304
tree8fee6eece91b6de2682428c347cb41ca98c0f1c8tree | snapshot
parent39136bb27900e185922a5e98d58e2d79501aec0fcommit | 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;