marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2023-03-31 02:33:03 +00:00
parent f46986a9ed
commit 44d6ac35c1
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quicksettings/docked/metadata.json
View file

@ -1,4 +1,3 @@
{ {
"KPackageStructure": "KPackage/GenericQML", "KPackageStructure": "KPackage/GenericQML",
"KPlugin": { "KPlugin": {