Commit graph

356 commits

Author SHA1 Message Date
l10n daemon script
66411f24e6 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"
2021-07-27 01:26:02 +00:00
l10n daemon script
622d96d50a 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"
2021-07-26 01:17:42 +00:00
l10n daemon script
393047e905 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"
2021-07-25 01:14:39 +00:00
l10n daemon script
d7de1fb9b1 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"
2021-07-24 01:14:22 +00:00
l10n daemon script
44a7f0d3cb 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"
2021-07-23 01:15:30 +00:00
Aleix Pol
dd888a707f Make it possible for QuickSettings to be created in a KPackage
Move the NightColor one into a KPackage to prove it
2021-07-21 13:36:43 +00:00