Commit e416f6d0 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 9a762724
...@@ -8,6 +8,7 @@ Name[ca]=Git Blame ...@@ -8,6 +8,7 @@ Name[ca]=Git Blame
Name[ca@valencia]=Git Blame Name[ca@valencia]=Git Blame
Name[es]=Git Blame Name[es]=Git Blame
Name[fr]=Blame « Git » Name[fr]=Blame « Git »
Name[ia]=Git Blame
Name[it]=Git Blame Name[it]=Git Blame
Name[nl]=Git-Blame Name[nl]=Git-Blame
Name[pl]=Git Blame Name[pl]=Git Blame
......
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