galou / freecad.cross

CROSS CAD and ROS, an Open-Source Synergy; ROS workbench for FreeCAD
GNU Lesser General Public License v2.1
95 stars 26 forks source link

Improve markdown of docker readme.md #13

Closed drfenixion closed 8 months ago

drfenixion commented 8 months ago

Improve markdown of docker readme.md

galou commented 8 months ago

Can you solve the conflicts so that I can merge?

drfenixion commented 8 months ago

Can you solve the conflicts so that I can merge?

I solved conflict after adding PR via web interface. I should be ok.

"This branch has no conflicts with the base branch"

galou commented 8 months ago

Maybe you didn't push because there is still a conflict?