shift-shell/initialstart
l10n daemon script 9f6345c3f3 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-05-08 02:24:47 +00:00
..
assets initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
modules SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
qml initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
CMakeLists.txt initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
main.cpp initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
Messages.sh initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
resources.qrc initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
settings.cpp initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
settings.h initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
utils.h initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
wizard.cpp initialstart: Add first login experience 2023-04-01 07:09:57 +00:00
wizard.h initialstart: Add first login experience 2023-04-01 07:09:57 +00:00