Skip to content
Snippets Groups Projects
Commit 4ba9b834 authored by Yannis Barlas's avatar Yannis Barlas
Browse files

resolve merge conflict

parents b74485d8 e61feefe
No related branches found
No related tags found
1 merge request!103Vivliostyle converter
Pipeline #3100 failed with stage
in 11 minutes and 10 seconds