Commit 5b3107d3 authored by Script Kiddy's avatar Script Kiddy

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 c4d8062c
......@@ -10,6 +10,7 @@ Name[en_GB]=ownCloud
Name[es]=ownCloud
Name[eu]=ownCloud
Name[fr]=ownCloud
Name[it]=ownCloud
Name[nl]=ownCloud
Name[nn]=ownCloud
Name[pt]=ownCloud
......
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