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"
4 years ago · 6634b8ff20
parent 117d68749b
commit 6634b8ff20
2 changed files with 2 additions and 0 deletions
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -7,6 +7,7 @@ Name[ca@valencia]=Contenidor del Latte
 Name[es]=Contenedor de Latte
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
 Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -7,6 +7,7 @@ Name[ca@valencia]=Contenidor del Latte
 Name[es]=Contenedor de Latte
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
 Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
 Name[pt]=Contentor do Latte