Commit de530d86 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 f32fc32e
......@@ -17,5 +17,6 @@ Name[sk]=Google Drive
Name[sv]=Google Drive
Name[uk]=Google Диск
Name[x-test]=xxGoogle Drivexx
Name[zh_TW]=Google 雲端硬碟
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