shift-shell/bin
l10n daemon script f4ca3b96c7 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-02-28 01:41:06 +00:00
..
CMakeLists.txt REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
kwinwrapper.in REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00
plasma-mobile.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-28 01:41:06 +00:00