kconfig.git/src/core/kconfigbackend.desktop, branch v5.96.0 hurd kconfig.git SVN_SILENT made messages (.desktop file) - always resolve ours 2022-07-01T01:42:24+00:00 l10n daemon script scripty@kde.org 2022-07-01T01:42:24+00:00 a0ee952c73f573df37556c68081e4ef1860eef51 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 2022-06-13T02:13:18+00:00 l10n daemon script scripty@kde.org 2022-06-13T02:13:18+00:00 a83e1f5068b6558c25a1366386fd4d4554efef63 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 2022-05-28T02:04:31+00:00 l10n daemon script scripty@kde.org 2022-05-28T02:04:31+00:00 5a01d0c0c14b66db121c8eeb2332f352b843f8da 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 2022-03-29T01:59:41+00:00 l10n daemon script scripty@kde.org 2022-03-29T01:59:41+00:00 66c8a3b8858584724bbde65077b1e2dbe9200bac 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-12-15T01:48:33+00:00 l10n daemon script scripty@kde.org 2021-12-15T01:48:33+00:00 eeefdf8aeabd875829ae6beee0e301a88c7da7c8 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-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"