Closed smoe closed 2 years ago
It is not enough to only resolve these conflicts in docs/src/gui/gladevcp.adoc that are reported, the other changes also need to be undone from that patch.
Why do you want to avoid '====' headers ?
AsciiDoc supports 5 levels of titles/secttions so there should no problem using up to '=====' !
Your last patch in which you transformed the {ini} to ini please undo - this should then merge just fine.