Commit 1539409f 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 3339ea4e
......@@ -51,7 +51,6 @@ Comment[x-test]=xxJuk Music Playerxx
Comment[zh_CN]=Juk 音乐播放器
Comment[zh_TW]=Juk 音樂播放器
Name=JuK
Name[ast]=JuK
Name[bg]=JuK
Name[bs]=JuK
Name[ca]=JuK
......
......@@ -9,7 +9,6 @@ X-DBUS-StartupType=Unique
Comment=
Terminal=false
Name=JuK
Name[ast]=JuK
Name[bg]=JuK
Name[bs]=JuK
Name[ca]=JuK
......
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