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
6416733153
commit
a94d566295
@ -79,6 +79,7 @@ Keywords[en_GB]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fr]=podcast
|
||||
Keywords[it]=podcast
|
||||
Keywords[ko]=팟캐스트
|
||||
Keywords[nl]=podcast
|
||||
Keywords[pl]=podkast
|
||||
Keywords[sl]=podcast
|
||||
|
Loading…
x
Reference in New Issue
Block a user