Commit b96d298c 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 59f53bef
Pipeline #228071 passed with stage
in 2 minutes and 38 seconds
......@@ -74,7 +74,7 @@ Comment[ta]=பிளாஸ்மாய்டுகளையும் பின
Comment[tr]=Duvar Kağıtlarını ve Araç Takımlarını Yönet
Comment[uk]=Керування шпалерами та віджетами
Comment[x-test]=xxManage Wallpaper and Widgetsxx
Comment[zh_CN]=管理壁纸和
Comment[zh_CN]=管理壁纸和
Comment[zh_TW]=管理桌布及元件
......
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