Fix merge conflicts for V2.4r2

VoronDesign · Feb 23, 2022 · 4512848 · 4512848
2 parents 7b13e50 + f82cb7b
commit 4512848
Show file tree

Hide file tree

Showing 325 changed files with 100,698 additions and 16,894 deletions.
diff --git a/CAD/VORON2.4_Assembly.f3d b/CAD/VORON2.4_Assembly.f3d
diff --git a/CAD/VORON2_v2.4_Assembly.f3d → CAD/VORON2.4_Assembly.step.zip b/CAD/VORON2_v2.4_Assembly.f3d → CAD/VORON2.4_Assembly.step.zip
diff --git a/CAD/VORON2_v2.4_Assembly.step.zip b/CAD/VORON2_v2.4_Assembly.step.zip
diff --git a/DXFs/Back_Panel_250.DXF b/DXFs/Back_Panel_250.DXF
diff --git a/DXFs/Back_Panel_300.DXF b/DXFs/Back_Panel_300.DXF
diff --git a/DXFs/Back_Panel_350.DXF b/DXFs/Back_Panel_350.DXF
diff --git a/DXFs/Deck_Panel_250.dxf b/DXFs/Deck_Panel_250.dxf
diff --git a/DXFs/Deck_Panel_300.dxf b/DXFs/Deck_Panel_300.dxf
diff --git a/DXFs/Deck_Panel_350.dxf b/DXFs/Deck_Panel_350.dxf
diff --git a/Docs/2.4_Assembly_Manual.pdf b/Docs/2.4_Assembly_Manual.pdf
diff --git a/Docs/What_the_git.md b/Docs/What_the_git.md