From 88953623358ee5a6b64bf06c5ab9ae73ca2b1307 Mon Sep 17 00:00:00 2001
From: cheyao <cyao@duck.com>
Date: Thu, 13 Feb 2025 08:50:41 +0100
Subject: [PATCH] Fix small errors introduced by the pr and resolve unresolved
 merge conflicts

---
 website/src/pages/hackpad/Tutorial.mdx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/website/src/pages/hackpad/Tutorial.mdx b/website/src/pages/hackpad/Tutorial.mdx
index d03b5ebc..abfef20f 100644
--- a/website/src/pages/hackpad/Tutorial.mdx
+++ b/website/src/pages/hackpad/Tutorial.mdx
@@ -295,7 +295,9 @@ Now go back to KiCAD PCB editor and click on your Edge.Cuts outline. In the bott
 
 <img src="/docs/v2/ruler.png" className="max-w-96" />
 <img src="/docs/v2/pcbsize.png" className="max-w-96" />
+
 If you used the Edge.Cuts outline, the width and height of your board are the widgth and height listed.
+
 If you used the ruler tool, the width of the board is the absolute value of x (41mm in my case), and the height is the absolute value of y (62.702mm) in my case.
 
 Next, create a sketch by by pressing the green + button on the top left, then clicking the bottom orange retangle at the center of the screen.
@@ -316,7 +318,7 @@ Center this rectangle by pressing the dimension button, press one edge of the sm
 
 <img src="/docs/v2/fusionrect3.png" className="max-w-96" />
 
-Now use the circle tool to draw 4 circles, one at each corner of the larger rectangle. set the diameter to 3.4mm when creating the circle, or use the sketch dimension tool to set their size to 3.4mm. Then, use the dimension tool to set their distance to their corresponding edges to 5mm (by clicking on their centers, then the corresponding edge):
+Now use the circle tool to draw 4 circles, one at each corner of the larger rectangle. Set the diameter to 3.4mm when creating the circle, or use the sketch dimension tool to set their size to 3.4mm. Then, use the dimension tool to set their distance to their corresponding edges to 5mm (by clicking on their centers, then the corresponding edge):
 
 <img src="/docs/v2/fusioncircle.png" className="max-w-96" />
 <img src="/docs/v2/fusioncircledim.png" className="max-w-96" />
@@ -327,18 +329,13 @@ Now add 4 more circles, this time with a diameter of 6mm. Select the center of t
 <img src="/docs/v2/fusioncoincident.png" className="max-w-96" />
 <img src="/docs/v2/fusionfinishsketch.png" className="max-w-96" />
 
-Press "Finish sketch" (green checkmark at top right of screen), then select all the outer circles (shift click) and press extrude (e). In the extrude menu, select Offset in Start, and enter 3.1mm as the Offset, then enter 9.9 mm in the Distance field and click ok:
+Press "Finish sketch" (green checkmark at top right of screen), then select all the outer circles (shift click) and press extrude (E key or the button at the top). In the extrude menu, select Offset in Start, and enter 3.1mm as the Offset, then enter 9.9 mm in the Distance field and click ok:
 
 <img src="/docs/v2/fusionextrude.png" className="max-w-96" />
 <img src="/docs/v2/fusionselect.png" className="max-w-96" />
 <img src="/docs/v2/fusionextrudemenu.png" className="max-w-96" />
 
-<<<<<<< HEAD
 Now, you must re-show the object be opening the Sketches folder on the left, and clicking the eye icon to the left of Sketch1. Then select the outer rectangle and press extrude. This time the Start shall be "Profile Plane" (and will be this for all future extrudes), and set the distance to 13mm:
-=======
-Now, you must re-show the object be opening the Sketches folder on the left, and cliking the eye icon on Sketch1. 
-Then select the outer rectangle and press extrude. This time the Start shall be "Profile Plane" (and will be for all future extrudes), and set the distance to 13mm:
->>>>>>> pr-source/tutorial-fix
 
 <img src="/docs/v2/fusionshow.png" className="max-w-96" />
 <img src="/docs/v2/fusionextrude2.png" className="max-w-96" />