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"
8 years ago · f696e3d922
parent 47d5fe1665
commit f696e3d922
1 changed files with 1 additions and 1 deletions
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@ -15,7 +15,7 @@ Name[fr]=Corbeille
 Name[gl]=Lixo
 Name[he]=אשפה 
 Name[hu]=Kuka
-Name[id]=Tong Sampah
+Name[id]=Sesampahan
 Name[is]=Rusl
 Name[it]=Cestino
 Name[ja]=ごみ箱