Commit bb0edcc8 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 a65a7ee4
......@@ -2,8 +2,8 @@
Name=DSLR Templates
Name[ar]=قوالب DSLR
Name[bs]=DSLR Predlošci
Name[ca]=Plantilles DSLR
Name[ca@valencia]=Plantilles DSLR
Name[ca]=Plantilles de rèflex digitals
Name[ca@valencia]=Plantilles de rèflex digitals
Name[cs]=Šablony DSLR
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