l10n daemon script 74914f1ce3 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"		2026-10-17 01:57:20 +00:00
..
ui	Emojier: Fix incorrect buttons/placeholder when search gives no results	2026-09-17 12:24:36 -04:00
CMakeLists.txt	emojier/app: merge CategoryAction into Emoijier.qml	2025-12-12 17:13:03 +00:00
emojier.cpp	Use better way to disable session management	2025-11-06 20:39:38 +01:00
org.kde.plasma.emojier.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-10-17 01:57:20 +00:00