Commit 35117ddd 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 63fdfe5d
......@@ -12,6 +12,7 @@ Name[es]=ownCloud
Name[eu]=ownCloud
Name[fr]=ownCloud
Name[hu]=ownCloud
Name[ia]=ownCloud
Name[it]=ownCloud
Name[nl]=ownCloud
Name[nn]=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