l10n daemon script f0e1d4e46e 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-04-16 01:47:42 +00:00
..
airplanemode	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
audio	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
battery	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
bluetooth	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
caffeine	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-09 01:50:14 +00:00
flashlight	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
keyboardtoggle	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-29 02:17:10 +00:00
location	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
mobiledata	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +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-04-09 01:50:14 +00:00
screenrotation	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
screenshot	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
settingsapp	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
wifi	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
CMakeLists.txt	quicksettings: Ensure package ids don't conflict with existing applets	2022-03-17 15:57:40 -04:00