l10n daemon script d11181090c 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"		2022-12-21 01:55:00 +00:00
..
common
compositing
decoration
desktop
effects	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-21 01:55:00 +00:00
options
rules
screenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-21 01:55:00 +00:00
scripts
tabbox
virtualkeyboard
xwayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-21 01:55:00 +00:00
CMakeLists.txt