Commit graph

4 commits

Author SHA1 Message Date
l10n daemon script
8722372e0f 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"
2020-02-10 05:42:27 +01:00
l10n daemon script
88f838d147 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"
2020-02-09 05:53:42 +01:00
l10n daemon script
5d486eca53 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"
2020-02-07 05:56:06 +01:00
Marco Martin
bcb3a7ea3b new applet to access KRunner functions 2020-02-05 19:57:44 +01:00