projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 093df7f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 16 Feb 2017 04:56:32 +0000 (05:56 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 16 Feb 2017 04:56:32 +0000 (05:56 +0100)
commitc1ebf2c48f4fc063cc965e03167afc6ed0ca6519
treefefbd912db821738bed46b12fae1c06fa567e668tree | snapshot
parent093df7f22a8f8e5770f0f6682d39de0c2a50a12dcommit | 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;