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 · f79266d148
parent 45008f12a2
commit f79266d148
1 changed files with 0 additions and 1 deletions
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -21,7 +21,6 @@ Comment[nn]=Breeze Dark-designspråk av KDE VDG
 Comment[pl]=Język Projektowania Ciemnego Pulpitu Bryzy przez KDE VDG
 Comment[pt]=Linguagem de Desenho do Ecrã Brisa Escuro, da VDG do KDE
 Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze Dark por KDE VDG
-Comment[ru]=Тёмный вариант оформления рабочей среды Breeze от KDE VDG
 Comment[sk]=Breeze, tmavý dizajn pracovnej plochy od KDE VDG
 Comment[sl]=Sapica (temna), oblikovalni jezik namizja avtorjev KDE VDG
 Comment[sr]=Језик дизајна површи Поветарац тамни од КДЕ‑ВДГ‑а