mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 18:56:34 +01:00
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"
This commit is contained in:
parent
11297e33e3
commit
641b5350d7
@ -12,6 +12,7 @@ Name[es]=Falkon
|
||||
Name[fi]=Falkon
|
||||
Name[fr]=Falkon
|
||||
Name[gl]=Falkon
|
||||
Name[ia]=Falkon
|
||||
Name[id]=Falkon
|
||||
Name[it]=Falkon
|
||||
Name[ko]=Falkon
|
||||
|
Loading…
Reference in New Issue
Block a user