kconfig.git/src/core/kconfigbackend.desktop, branch v5.89.0 hurd kconfig.git SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-29T01:30:30+00:00 l10n daemon script scripty@kde.org 2021-11-29T01:30:30+00:00 594e62461f2f3b22dffda7470124de32125b6ed6 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 2021-11-28T01:24:43+00:00 l10n daemon script scripty@kde.org 2021-11-28T01:24:43+00:00 973dfd484024f7248cff51ded0efc13e4d554f59 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 2021-10-01T01:21:46+00:00 l10n daemon script scripty@kde.org 2021-10-01T01:21:46+00:00 1e42d79728f57197a8c70618ef48cc38b8c27ac7 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 2021-02-04T05:41:42+00:00 l10n daemon script scripty@kde.org 2021-02-04T05:41:42+00:00 68f8622dc9d40f9a8df7fa49680a109f7f924ddb 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 2020-09-21T03:53:34+00:00 l10n daemon script scripty@kde.org 2020-09-21T03:53:34+00:00 21a40e05397f15aea066cabd36b9ada9d6ba412b 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 2020-07-14T03:53:21+00:00 l10n daemon script scripty@kde.org 2020-07-14T03:53:21+00:00 538cf784734434e5478f7b3dab8af131304dd656 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 2020-06-18T03:30:19+00:00 l10n daemon script scripty@kde.org 2020-06-18T03:30:19+00:00 56a44a5de2e2bbb0041d6cd56575969cc254160c 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 2020-06-17T11:58:15+00:00 l10n daemon script scripty@kde.org 2020-06-17T11:58:15+00:00 27882eb23d0a0ecfdd4e2d06120ef3c047c733f3 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 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"