Commit d936db2f 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 6a4e5489
......@@ -2,7 +2,7 @@
Name=(7) Miscellaneous
Name[af]=(7) Allerlei
Name[ar]=(7) متنوع
Name[ast]=(7) Miscelaina
Name[ast]=(7) Miscelánea
Name[be]=(7) Рознае
Name[be@latin]=(7) Roznaje
Name[bg]=(7) Разни
......
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