mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-20 10:04:01 +03: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
d7e9fbe772
commit
db47394e33
@ -53,7 +53,6 @@
|
||||
"License": "GPL v2+",
|
||||
"Name": "Latte",
|
||||
"Name[ar]": "لاتيه",
|
||||
"Name[ast]": "Latte",
|
||||
"Name[az]": "Latte",
|
||||
"Name[ca@valencia]": "Latte",
|
||||
"Name[ca]": "Latte",
|
||||
|
Loading…
x
Reference in New Issue
Block a user