l10n daemon script 3c628b921e 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-05-20 05:39:37 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-20 05:39:37 +02:00
plugin	Modernize using clang-tidy	2018-12-31 04:13:55 +01:00
src	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-20 05:39:37 +02:00
CMakeLists.txt	[dialer] Add KPeople helper plugin	2015-07-15 21:17:35 +02:00