muon-maintenance:master

Last commit made on 2022-06-25
Get this branch:
git clone -b master https://git.launchpad.net/muon-maintenance

Branch merges

Branch information

Name:
master
Repository:
lp:muon-maintenance

Recent commits

a7cc1a3... by l10n daemon script <email address hidden>

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"

cab7094... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

17a9d54... by l10n daemon script <email address hidden>

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"

9bdf2ea... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

16d1e86... by l10n daemon script <email address hidden>

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"

12cb8ee... by l10n daemon script <email address hidden>

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"

ce45fad... by l10n daemon script <email address hidden>

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"

e8bc5a7... by l10n daemon script <email address hidden>

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"

036b0e7... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

59b66b8... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)