search

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

Fr backtranslation #13

Closed smoe closed 2 years ago

smoe commented 2 years ago

;) I am a bit lost. What I though I was doing was to get the new commit from master into your branch - anyway, just ignore me and kindly address the rebase to master if you can. There have been a few annoying but good commits to the documentation.

smoe commented 2 years ago

Hi @silopolis, that conflicts reported are exactly those conflicts that I had to solve to rebase against the latest master. The effort should be worth it.