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"
10 years ago · 2ba23ef4c7
parent adc06a7dff
commit 2ba23ef4c7
1 changed files with 0 additions and 1 deletions
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -32,7 +32,6 @@ Comment[tr]=KDE VDG tarafından geliştirilen Breeze Koyu Masaüstü Tasarım Di
 Comment[uk]=Мова розробки стільниці Breeze Dark, створена KDE VDG
 Comment[x-test]=xxBreeze Dark Desktop Design Language by the KDE VDGxx
 Comment[zh_CN]=KDE 视觉设计组设计的暗色微风桌面设计语言
-Comment[zh_TW]=KDE VDG 團隊設計的 Breeze Dark 桌面設計語言
 Encoding=UTF-8
 Name=Breeze Dark
 Name[ar]=نسيم داكن