kconfig.git/src/core/kconfigbackend.desktop, branch v5.48.0

SVN_SILENT made messages (.desktop file) - always resolve ours

2018-04-06T03:23:56+00:00

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"

2017-07-07T02:33:03+00:00

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"

2016-12-21T04:46:48+00:00

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"

2016-12-20T11:50:08+00:00

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"

2016-01-20T12:41:24+00:00

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"

2015-11-21T19:21:44+00:00

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"

2015-11-04T17:04:03+00:00

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"

2015-04-07T13:15:22+00:00

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"

2014-12-14T08:53:28+00:00

2014-07-12T03:58:50+00:00