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 · 302018cb8c
parent e64779e0ba
commit 302018cb8c
1 changed files with 1 additions and 1 deletions
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@ -863,7 +863,7 @@ Description[hr]=URL pošalji e-poštom
 Description[hsb]=URL za mejlku
 Description[hu]=Az URL elküldése levélben
 Description[ia]=Mail-URL
-Description[id]=URL-Surat
+Description[id]=URL-Mail
 Description[is]=Póstsenda slóð
 Description[it]=URL di posta
 Description[ja]=Mail-URL