mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00: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
260af8e610
commit
482f781b8c
1 changed files with 2 additions and 2 deletions
|
|
@ -113,6 +113,6 @@
|
|||
"Name[zh_TW]": "Plasma 行動",
|
||||
"Website": "https://plasma-mobile.org"
|
||||
},
|
||||
"X-Plasma-FallbackPackage": "org.kde.plasma.nano",
|
||||
"X-Plasma-APIVersion": "2"
|
||||
"X-Plasma-APIVersion": "2",
|
||||
"X-Plasma-FallbackPackage": "org.kde.plasma.nano"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue