Commit 09599f4e authored by Script Kiddy's avatar Script Kiddy

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"
parent fb592558
...@@ -5,6 +5,7 @@ MimeType=application/x-kcachegrind; ...@@ -5,6 +5,7 @@ MimeType=application/x-kcachegrind;
Icon=kcachegrind Icon=kcachegrind
Terminal=false Terminal=false
Name=QCachegrind Name=QCachegrind
Name[bs]=QCachegrind Name[bs]=QCachegrind
Name[ca]=QCachegrind Name[ca]=QCachegrind
Name[ca@valencia]=QCachegrind Name[ca@valencia]=QCachegrind
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment