shift-shell/containments
l10n daemon script 67216063fd 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-01-09 06:03:34 +01:00
..
homescreen SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
panel SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
taskpanel SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
CMakeLists.txt new bottom panel containment with close button 2015-06-11 15:35:46 -07:00