Commit graph

4 commits

Author SHA1 Message Date
l10n daemon script
c642da0a71 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-12-05 06:35:03 +01:00
l10n daemon script
99e43d39a2 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-12-04 06:29:34 +01:00
l10n daemon script
e2e6d4cc13 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-12-03 06:37:59 +01:00
Han Young
b34862e469 add notification for successful screenshot taking 2020-12-01 14:25:28 +00:00