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
b23289b296
commit
dc34268d40
@ -2,7 +2,7 @@
|
||||
# SPDX-FileCopyrightText: 2021 Bart De Vries <bart@mogwai.be>
|
||||
[Desktop Entry]
|
||||
Name=Kasts
|
||||
Name[ar]=كاستس
|
||||
Name[ar]=كاست
|
||||
Name[ast]=Kasts
|
||||
Name[ca]=Kasts
|
||||
Name[ca@valencia]=Kasts
|
||||
|
Loading…
x
Reference in New Issue
Block a user