Commit e404b685 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 71d837d9
......@@ -2,7 +2,6 @@
Name=Mobipocket Files
Name[ar]=ملفات Mobipocket
Name[ast]=Ficheros Mobipocket
Name[bg]=Файлове за Mobipocket
Name[bs]=Mobipoketove datoteke
Name[ca]=Fitxers Mobipocket
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