Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
45cdc532f3 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"
2023-01-22 02:02:20 +00:00
Fabian Vogt
7a9565ff7e Record quicksettings: Move metadata.json to right location
It needs to be next to contents/, not inside.
2023-01-19 18:33:02 +01:00
Renamed from quicksettings/record/package/contents/metadata.json (Browse further)