l10n daemon script a005e9b746 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-03-24 01:50:51 +00:00
..
airplanemode	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
audio	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-24 01:50:51 +00:00
battery	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
bluetooth	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-24 01:50:51 +00:00
caffeine	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-24 01:50:51 +00:00
flashlight	quicksettings: Fix flashlight	2022-03-20 14:35:57 -04:00
keyboardtoggle	quicksettings: Ensure package ids don't conflict with existing applets	2022-03-17 15:57:40 -04:00
location	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
mobiledata	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
nightcolor	quicksettings: Ensure package ids don't conflict with existing applets	2022-03-17 15:57:40 -04:00
powermenu	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
screenrotation	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
screenshot	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:12:05 +00:00
settingsapp	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-24 01:50:51 +00:00
wifi	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-24 01:50:51 +00:00
CMakeLists.txt	quicksettings: Ensure package ids don't conflict with existing applets	2022-03-17 15:57:40 -04:00