shift-shell/applets/clock
l10n daemon script 1ebe7dbb7a 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"
2017-12-20 07:06:18 +01: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 2017-12-20 07:06:18 +01:00