Falkon/3.1 : lp:~lubuntu-dev/+git/falkon-daily : Git : Code : “Lubuntu Developers” team

Get this branch:: git clone -b Falkon/3.1 https://git.launchpad.net/~lubuntu-dev/+git/falkon-daily

You will only be able to propose a merge to another personal repository with the same name.

Branch information

8a8a5dd... by l10n daemon script <email address hidden> on 2022-01-10

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"

47a8917... by l10n daemon script <email address hidden> on 2021-08-23

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"

2fe55e7... by l10n daemon script <email address hidden> on 2021-08-19

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"

e8ecd86... by l10n daemon script <email address hidden> on 2021-08-14

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"

e639e75... by l10n daemon script <email address hidden> on 2021-08-09

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"

7437392... by l10n daemon script <email address hidden> on 2021-07-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"

46ab9df... by l10n daemon script <email address hidden> on 2021-07-15

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"

1ffacaa... by l10n daemon script <email address hidden> on 2021-07-15

GIT_SILENT made messages (after extraction)

bc3690b... by l10n daemon script <email address hidden> on 2021-06-05

GIT_SILENT made messages (after extraction)

4bd8cda... by l10n daemon script <email address hidden> on 2021-03-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"

»