~usarinheininga/ubuntuplasma/+git/latte-dock:v0.9

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

dcd9dd6... by l10n daemon script <email address hidden> on 2020-10-11

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"

c40db39... by l10n daemon script <email address hidden> on 2020-10-11

GIT_SILENT made messages (after extraction)

ad4fba5... by l10n daemon script <email address hidden> on 2020-08-20

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"

e67298b... by l10n daemon script <email address hidden> on 2020-07-29

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"

b6ef9b5... by l10n daemon script <email address hidden> on 2020-07-29

GIT_SILENT made messages (after extraction)

ce365f3... by l10n daemon script <email address hidden> on 2020-07-28

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"

5fce1a5... by l10n daemon script <email address hidden> on 2020-07-28

GIT_SILENT made messages (after extraction)

9d8fdf7... by l10n daemon script <email address hidden> on 2020-06-24

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"

41bde13... by l10n daemon script <email address hidden> on 2020-06-24

GIT_SILENT made messages (after extraction)

fb190a3... by l10n daemon script <email address hidden> on 2020-06-18

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"