kconfig.git/src/core/kconfigbackend.desktop, branch v5.71.0 hurd kconfig.git SVN_SILENT made messages (.desktop file) - always resolve ours 2020-05-31T18:18:31+00:00 l10n daemon script scripty@kde.org 2020-05-31T18:18:31+00:00 94b1b005b87bce66f88897db7433c602f9deb49b 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-14T03:06:10+00:00 l10n daemon script scripty@kde.org 2019-08-14T03:06:10+00:00 2de9e4fc165bcadd54f81b7d17904c45632705f5 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-10T04:24:03+00:00 l10n daemon script scripty@kde.org 2018-10-10T04:24:03+00:00 27764485b4b91b909d5b47bf9b75567474031a98 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-26T03:37:52+00:00 l10n daemon script scripty@kde.org 2018-08-26T03:37:52+00:00 ae1da3f99e349619143ac3cdb3e0d91b84e3efab 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2018-04-06T03:23:56+00:00 l10n daemon script scripty@kde.org 2018-04-06T03:23:56+00:00 9c8785b130b13573229f3791f8165200f9e2c037 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2017-07-07T02:33:03+00:00 l10n daemon script scripty@kde.org 2017-07-07T02:33:03+00:00 0664e644d6aed666a2465ecb5f3eb852d6fdc6b8 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-21T04:46:48+00:00 l10n daemon script scripty@kde.org 2016-12-21T04:46:48+00:00 9d5b64f16243d14e27402be23224f08cd8420bbe 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20T11:50:08+00:00 l10n daemon script scripty@kde.org 2016-12-20T11:50:08+00:00 f86f153a8050c9337e0f6c7b84171f50474df3b1 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2016-01-20T12:41:24+00:00 l10n daemon script scripty@kde.org 2016-01-20T12:41:24+00:00 2639e721ee40817a731f551f4d27a475db073245 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" 
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"
SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-21T19:21:44+00:00 l10n daemon script scripty@kde.org 2015-11-21T19:21:44+00:00 417c7300ef01cc3aa0d11f8e5506d365855019e2 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" 
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"