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"
6 years ago · c3c6c3a669
parent c8ac6548e4
commit c3c6c3a669
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -9,6 +9,7 @@ Name[et]=Flow
 Name[eu]=Flow
 Name[fi]=Flow
 Name[fr]=Flux
+Name[ia]=Fluxo (Flow)
 Name[it]=Flusso
 Name[ko]=흐름
 Name[nl]=Flow