Skip to content

catalog: fix conf conflict detection

Libor Peltan requested to merge cat_fix_conflict into master

Fixes #761

Merge request reports