GitLab

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"

Empty collection is saved as a template in $CONFIG/collection-templates.
Unit test for verifying validity of saved collection. Yet to do is to
add feature to remove saved templates.

BUG: 450043
FIXED-IN: 3.5

Be sure to have directory delimiters where appropriate. Add a unit test
case with a wine collection.

BUG: 453075
FIXED-IN: 3.4.5

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"

Depends on the yaz-marcdump executable from the yaz library to output
marcxml as an intermediate format.

FIXED-IN: 3.5