shift-shell/applets
l10n daemon script f3b1522bf6 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-08-20 05:05:24 +02:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-20 05:39:37 +02:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-20 05:05:24 +02:00
notifications SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-20 05:39:37 +02:00
CMakeLists.txt don't build quicksettings 2017-09-18 12:31:28 +02:00