Plasma/5.4 : lp:muon-maintenance : Git : Code : muon

Get this branch:: git clone -b Plasma/5.4 https://git.launchpad.net/muon-maintenance

Branch information

4a24fbd... 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"

b5a45ae... by l10n daemon script <email address hidden> on 2018-08-27

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"

336a8ee... by l10n daemon script <email address hidden> on 2018-07-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"

e3baede... by l10n daemon script <email address hidden> on 2018-04-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"

a6b31cf... by l10n daemon script <email address hidden> on 2018-03-31

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"

2b60afe... by l10n daemon script <email address hidden> on 2018-03-26

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"

51ae645... by l10n daemon script <email address hidden> on 2018-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"

6fbb223... by l10n daemon script <email address hidden> on 2018-03-17

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"

e453361... by l10n daemon script <email address hidden> on 2018-02-04

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"

2c71f96... by l10n daemon script <email address hidden> on 2017-10-01

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"

»