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 · 30ca8c3aeb
parent 3bb9314603
commit 30ca8c3aeb
1 changed files with 1 additions and 0 deletions
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@ -24,6 +24,7 @@ Name[pt]=Falkon
 Name[pt_BR]=Falkon
 Name[ru]=Falkon
 Name[sk]=Falkon
+Name[sl]=Falkon
 Name[sv]=Falkon
 Name[uk]=Falkon
 Name[x-test]=xxFalkonxx