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 · b5ec4e2187
parent 2ea44649da
commit b5ec4e2187
1 changed files with 1 additions and 0 deletions
--- a/lookandfeel/contents/loginmanager/metadata.desktop
+++ b/lookandfeel/contents/loginmanager/metadata.desktop
@ -58,6 +58,7 @@ Description[et]=Breeze teema
 Description[fi]=Breeze-teema
 Description[fr]=Thème brise
 Description[gl]=Tema Breeze
+Description[he]=ערכת הנושא Breeze
 Description[hu]=Breeze téma
 Description[id]=Tema Angin
 Description[is]=Breeze þema