Commit 3d29ee60 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 42ce4852
......@@ -7,6 +7,7 @@ Name[az]=Git Blame
Name[ca]=Git Blame
Name[ca@valencia]=Git Blame
Name[cs]=Git Blame
Name[de]=Git Blame
Name[en_GB]=Git Blame
Name[es]=Git Blame
Name[fr]=Blame « Git »
Supports Markdown
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