“Lubuntu Developers” team

~lubuntu-dev/+git/falkon-daily:Falkon/3.0

Last commit made on 2019-02-25

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

Branch merges

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

Branch information

Name:: Falkon/3.0

Repository:: lp:~lubuntu-dev/+git/falkon-daily

Recent commits

860433d... by l10n daemon script <email address hidden> on 2019-02-25

GIT_SILENT made messages (after extraction)

d167f91... by l10n daemon script <email address hidden> on 2019-02-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"

e5220af... by l10n daemon script <email address hidden> on 2019-02-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"

d5fa8bc... by l10n daemon script <email address hidden> on 2019-02-13

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"

70043fb... by l10n daemon script <email address hidden> on 2019-02-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"

142fa7d... by l10n daemon script <email address hidden> on 2019-02-09

GIT_SILENT made messages (after extraction)

f9d4f33... by l10n daemon script <email address hidden> on 2019-01-21

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"

c65278f... by l10n daemon script <email address hidden> on 2019-01-21

GIT_SILENT made messages (after extraction)

f4ef90c... by l10n daemon script <email address hidden> on 2019-01-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"

2997dd6... by l10n daemon script <email address hidden> on 2019-01-06

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"

»