silopolis / linuxcnc

LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more.
http://linuxcnc.org/
GNU General Public License v2.0
1 stars 0 forks source link

Compiles for me!! #12

Closed smoe closed 2 years ago

smoe commented 2 years ago

Your last patch in which you transformed the {ini} to ini please undo - this should then merge just fine.

smoe commented 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.

silopolis commented 2 years ago

Why do you want to avoid '====' headers ?

AsciiDoc supports 5 levels of titles/secttions so there should no problem using up to '=====' !