shift-shell/applets
l10n daemon script 78ce668071 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"
2019-11-20 05:40:05 +01:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:40:05 +01:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:40:05 +01:00
CMakeLists.txt Remove old notification applet 2019-10-25 10:22:57 +00:00