l10n daemon script 16ccd123dd 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"		5 years ago
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	5 years ago
plugin	add Containment.ThemeColorsGroup enum	5 years ago
CMakeLists.txt	MAJOR MAJOR:splitting types to their own component	5 years ago
Messages.sh	use kde translations infrastructure	8 years ago
metadata.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	5 years ago