l10n daemon script bc957af28e 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"		2023-11-26 02:31:49 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-11-26 02:31:49 +00:00
.gitignore
CMakeLists.txt