Commit Graph

6 Commits

Author SHA1 Message Date
l10n daemon script
91f82fb42c 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-11-07 06:24:31 +01:00
l10n daemon script
ed3919cb83 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-11-06 06:20:30 +01:00
l10n daemon script
bd0a01b235 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-11-05 06:31:55 +01:00
l10n daemon script
36a92be7bd 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-11-04 06:30:04 +01:00
l10n daemon script
e4338a599e 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-11-03 06:12:27 +01:00
Tobias Fella
8e7c84fd78 Port the notification backend to KNotifications 2020-11-02 22:46:51 +00:00