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"
3 years ago · 7a0b30c4c3
parent e585fb2872
commit 7a0b30c4c3
1 changed files with 1 additions and 1 deletions
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@ -54,7 +54,7 @@ Comment[et]=Soovimatu veebisisu blokkimine
 Comment[eu]=Oztopatu nahi ez den web edukia
 Comment[fi]=Estää epätoivotun verkkosisällön
 Comment[fr]=Blocage des contenus Web indésirables
-Comment[gl]=Bloquea contenido web non desexado
+Comment[gl]=Bloquea contido web non desexado
 Comment[ia]=Bloca contento de web non volite
 Comment[id]=Memblokir konten web yang tak diinginkan
 Comment[is]=Lokar á óumbeðið vefefni