marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/applets/clock
History
l10n daemon script e8d2bfe884 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"
2016-11-04 09:46:15 +00:00
..
contents/ui add notifications and clock applets placeholders 2015-03-05 17:17:27 +01:00
Messages.sh add notifications and clock applets placeholders 2015-03-05 17:17:27 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-11-04 09:46:15 +00:00