kconfig.git/src/core/kconfigbackend.desktop, branch v5.10.0hurd kconfig.gitSVN_SILENT made messages (.desktop file) - always resolve ours2015-04-07T13:15:22+00:00l10n daemon scriptscripty@kde.org2015-04-07T13:15:22+00:00390178b4a6f7d3621b0593e3b73fdb3d13ac0e57
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)2014-12-14T08:53:28+00:00l10n daemon scriptscripty@kde.org2014-12-14T08:53:28+00:007ce3b7f4a03c6af12cd7cbddbaee1694220c9e39
SVN_SILENT made messages (.desktop file)2014-07-12T03:58:50+00:00l10n daemon scriptscripty@kde.org2014-07-12T03:58:50+00:004160e4cbebfc283efe6ffc99c9cb82322616c210
SVN_SILENT made messages (.desktop file)2014-06-23T08:35:21+00:00l10n daemon scriptscripty@kde.org2014-06-23T08:35:21+00:00bcac505588d8e14817aeede8b2f21be6cbe4da34
SVN_SILENT made messages (.desktop file)2014-05-03T08:34:03+00:00l10n daemon scriptscripty@kde.org2014-05-03T08:34:03+00:0090064f2e064317bba26f11bb90504bb2b556232f
SVN_SILENT made messages (.desktop file)2014-05-02T08:52:20+00:00l10n daemon scriptscripty@kde.org2014-05-02T08:52:20+00:002dacbc05898bb0f6ccdfab033d954017bd75b975
SVN_SILENT made messages (.desktop file)2014-04-29T10:13:25+00:00l10n daemon scriptscripty@kde.org2014-04-29T10:13:25+00:002ae27a58ec03af8a83fb1e5c4e8364c3458ba248
SVN_SILENT made messages (.desktop file)2014-04-29T04:50:08+00:00l10n daemon scriptscripty@kde.org2014-04-29T04:50:08+00:00eed5032a41f61ae342f979b76cb1904e877d5e5a
SVN_SILENT made messages (.desktop file)2014-04-28T15:58:43+00:00l10n daemon scriptscripty@kde.org2014-04-28T15:58:43+00:00d17a1829fbe2adf54547d8cfef6a6e62ecfeba35
SVN_SILENT made messages (.desktop file)2014-04-28T12:43:50+00:00l10n daemon scriptscripty@kde.org2014-04-28T12:43:50+00:0098913875c15d6ac017feb7c6ef6869e3b4c8ff42