Commit 141f42ba 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 a17a32d5
......@@ -5,6 +5,7 @@ Name[ca@valencia]=ownCloud
Name[cs]=ownCloud
Name[de]=ownCloud
Name[el]=ownCloud
Name[en_GB]=ownCloud
Name[es]=ownCloud
Name[eu]=ownCloud
Name[fr]=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